New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

iwl7000 messing up sysfs

Project Member Reported by groeck@chromium.org, Jan 30 2018

Issue description

[   12.406078] sysfs: cannot create duplicate filename '/class/ieee80211'
[   12.413421] ------------[ cut here ]------------
[   12.418594] WARNING: CPU: 2 PID: 1134 at /mnt/host/source/src/third_party/kernel/v4.14/fs/sysfs/dir.c:31 sysfs_warn_dup+0x64/0x74
[   12.431630] Modules linked in: joydev cfg80211(+) hid_multitouch iio_trig_sysfs cros_ec_light_prox cros_ec_sensors_ring cros_ec_sensors cros_ec_sensors_core industrialio_triggered_buffer kfifo_buf industrialio ip6table_filter iwlmvm iwl7000_mac80211 r8152 mii iwlwifi iwl7000_cfg80211
[   12.459773] CPU: 2 PID: 1134 Comm: modprobe Not tainted 4.14.15 #11
[   12.466787] Hardware name: Google Eve/Eve, BIOS Google_Eve.9584.95.0 09/27/2017
[   12.474965] task: ffff88040585d400 task.stack: ffff880405a20000
[   12.481596] RIP: 0010:sysfs_warn_dup+0x64/0x74

Complete dmesg attached.

 
dmesg
83.1 KB View Download

Comment 1 by groeck@chromium.org, Jan 30 2018

There is now a separate 'wireless' subdirectory directory in iwl7000 which duplicates the entire wireless code, making everything a mess since the wireless code is now built and loaded twice.


Comment 2 by groeck@chromium.org, Jan 30 2018

Cc: briannorris@chromium.org
Owner: kirtika@chromium.org
Status: Assigned (was: Untriaged)
kirtika@: CONFIG_CFG80211 must be dropped from base.config. This in turn results in huge config file changes all over the place. Let me know if you want to own this; otherwise I'll disable IWL7000 for the time being until someone picks it up and fixes the problem.

Comment 3 by groeck@chromium.org, Jan 30 2018

tracefs is messed up as well.

[   11.281834] Could not create tracefs 'rdev_set_mcast_rate' directory
[   11.289207] Could not create tracefs 'rdev_start_radar_detection' directory
[   11.297069] Could not create tracefs 'cfg80211_stop_iface' directory
[   11.304246] Could not create tracefs 'cfg80211_ft_event' directory
[   11.311314] Could not create tracefs 'cfg80211_report_wowlan_wakeup' directory
[   11.319511] Could not create tracefs 'cfg80211_return_u32' directory
[   11.326659] Could not create tracefs 'cfg80211_return_uint' directory
[   11.333946] Could not create tracefs 'cfg80211_return_bss' directory
[   11.341136] Could not create tracefs 'cfg80211_inform_bss_frame' directory
[   11.348874] Could not create tracefs 'cfg80211_get_bss' directory
[   11.355745] Could not create tracefs 'cfg80211_sched_scan_results' directory
[   11.363687] Could not create tracefs 'cfg80211_sched_scan_stopped' directory
[   11.371610] Could not create tracefs 'cfg80211_scan_done' directory
[   11.378672] Could not create tracefs 'cfg80211_tdls_oper_request' directory
[   11.386513] Could not create tracefs 'cfg80211_report_obss_beacon' directory
[   11.394698] Could not create tracefs 'cfg80211_pmksa_candidate_notify' directory
[   11.403268] Could not create tracefs 'cfg80211_gtk_rekey_notify' directory
[   11.411270] Could not create tracefs 'cfg80211_cqm_pktloss_notify' directory
[   11.419465] Could not create tracefs 'cfg80211_probe_status' directory
[   11.427088] Could not create tracefs 'cfg80211_ibss_joined' directory
[   11.434596] Could not create tracefs 'cfg80211_rx_unexpected_4addr_frame' directory
[   11.443443] Could not create tracefs 'cfg80211_rx_spurious_frame' directory
[   11.451515] Could not create tracefs 'cfg80211_cac_event' directory
[   11.458810] Could not create tracefs 'cfg80211_radar_event' directory
[   11.466333] Could not create tracefs 'cfg80211_ch_switch_started_notify' directory
[   11.475139] Could not create tracefs 'cfg80211_ch_switch_notify' directory
[   11.483158] Could not create tracefs 'cfg80211_chandef_dfs_required' directory
[   11.491638] Could not create tracefs 'cfg80211_reg_can_beacon' directory
[   11.499206] Could not create tracefs 'cfg80211_cqm_rssi_notify' directory
[   11.506870] Could not create tracefs 'cfg80211_mgmt_tx_status' directory
[   11.514685] Could not create tracefs 'cfg80211_rx_mgmt' directory
[   11.521558] Could not create tracefs 'cfg80211_del_sta' directory
[   11.528434] Could not create tracefs 'cfg80211_new_sta' directory
[   11.535308] Could not create tracefs 'cfg80211_ready_on_channel_expired' directory
[   11.543843] Could not create tracefs 'cfg80211_ready_on_channel' directory
[   11.551630] Could not create tracefs 'cfg80211_michael_mic_failure' directory
[   11.559683] Could not create tracefs 'cfg80211_send_assoc_timeout' directory
[   11.567636] Could not create tracefs 'cfg80211_send_auth_timeout' directory
[   11.575522] Could not create tracefs 'cfg80211_tx_mlme_mgmt' directory
[   11.583172] Could not create tracefs 'cfg80211_rx_mlme_mgmt' directory
[   11.590753] Could not create tracefs 'cfg80211_rx_unprot_mlme_mgmt' directory
[   11.599065] Could not create tracefs 'cfg80211_send_rx_assoc' directory
[   11.606755] Could not create tracefs 'cfg80211_send_rx_auth' directory
[   11.614378] Could not create tracefs 'cfg80211_notify_new_peer_candidate' directory
[   11.623365] Could not create tracefs 'cfg80211_return_bool' directory
[   11.630879] Could not create tracefs 'rdev_del_pmk' directory
[   11.637611] Could not create tracefs 'rdev_set_pmk' directory
[   11.644370] Could not create tracefs 'rdev_tdls_cancel_channel_switch' directory
[   11.652977] Could not create tracefs 'rdev_tdls_channel_switch' directory
[   11.660639] Could not create tracefs 'rdev_del_tx_ts' directory
[   11.667363] Could not create tracefs 'rdev_add_tx_ts' directory
[   11.674610] Could not create tracefs 'rdev_set_ap_chanwidth' directory
[   11.681995] Could not create tracefs 'rdev_set_qos_map' directory
[   11.688895] Could not create tracefs 'rdev_channel_switch' directory
[   11.696105] Could not create tracefs 'rdev_crit_proto_stop' directory
[   11.703391] Could not create tracefs 'rdev_crit_proto_start' directory
[   11.710809] Could not create tracefs 'rdev_update_ft_ies' directory
[   11.717913] Could not create tracefs 'rdev_set_mac_acl' directory

[ and more ]

Comment 4 by groeck@chromium.org, Jan 30 2018

Cc: evgreen@chromium.org
Components: OS>Systems>Network
Labels: OS-Chrome
Ugh, did we merge the cfg80211 forking before we landed the init ordering changes? Kirtika has this issue on her radar, I think, but we shouldn't have merged the driver before fixing the remaining issues here:

https://bugs.chromium.org/p/chromium/issues/detail?id=782368
https://b.corp.google.com/issues/68778576

Particularly, this is outstanding (and probably "fixes" the $subject issue):

https://chromium-review.googlesource.com/c/aosp/platform/system/connectivity/shill/+/890221

Comment 6 by kirtika@google.com, Jan 30 2018

Reply to comment #5, yes, because meowth needed Core31 and 4.14 isn't shipping/running on any builder yet, so we could afford to take in the driver drop before the fixes. 

Comment 7 by groeck@chromium.org, Jan 30 2018

#6: Hmm. "It is ok to mess up things as long as no one notices". I'll need to keep that in mind.

FWIW, I consider the planned "fix" to be a hack which should not be acceptable. If the Intel code doesn't work with CFG80211 and enabling both results in kernel failures as observed, it should not both be enabled. Or the Intel code should be implemented properly and not depend on such a hack.

Labels: -Pri-1 Pri-2
Owner: ----
Status: Available (was: Assigned)
I'd either mark this duplicate of  issue 782368 , or else leave it open with lower priority, if we think there's a path forward toward undoing the cfg80211 fork (and thereby *really* making sure this problem never happens).

Or maybe some other solution? Like trying to mask one module or the other, if we can determine a particular build is definitely only going to use Intel vs. other Wifi?
Cc: cernekee@chromium.org
Labels: Kernel-4.4
Urgh, so now that this is rolling out to more kernels (and network_WlanDriver is running regularly in bvt-perbuild, and catching these kinds of errors), it seems that the problem isn't completely resolved. I see Reef failing here:

https://stainless.corp.google.com/search?exclude_retried=true&first_date=2018-02-16&master_builder_name=&builder_name_number=&shard=&exclude_acts=true&builder_name=&master_builder_name_number=&owner=&retry=&exclude_cts=true&exclude_non_production=true&hostname=&board=&test=%5Enetwork%5C_WlanDriver%24&exclude_not_run=false&build=%5ER66%5C-10427%5C.0%5C.0%24&status=FAIL&status=ERROR&status=ABORT&reason=&waterfall=&suite=&last_date=2018-02-22&exclude_non_release=false&exclude_au=true&model=%5Ereef%24&view=list

https://pantheon.corp.google.com/storage/browser/chromeos-autotest-results/178551057-chromeos-test/chromeos6-row3-rack12-host11/sysinfo/


Shows:

2018-02-22T13:57:29.563158+00:00 WARNING kernel: [    9.602573] Could not create tracefs 'cfg80211_stop_iface' directory
2018-02-22T13:57:29.563183+00:00 WARNING kernel: [    9.602589] Could not create tracefs 'cfg80211_ft_event' directory
2018-02-22T13:57:29.563185+00:00 WARNING kernel: [    9.602593] Could not create tracefs 'cfg80211_report_wowlan_wakeup' directory
2018-02-22T13:57:29.563186+00:00 WARNING kernel: [    9.602598] Could not create tracefs 'cfg80211_return_u32' directory
...
2018-02-22T13:57:29.564549+00:00 WARNING kernel: [    9.604054] ------------[ cut here ]------------
2018-02-22T13:57:29.564556+00:00 WARNING kernel: [    9.604071] WARNING: CPU: 0 PID: 1486 at ../../../../../tmp/portage/sys-kernel/chromeos-kernel-4_4-4.4.115-r1375/work/chromeos-kernel-4_4-4.4.115/fs/sysfs/dir.c:31 sysfs_warn_dup+0x64/0x73
2018-02-22T13:57:29.564558+00:00 WARNING kernel: [    9.604074] sysfs: cannot create duplicate filename '/class/ieee80211'
2018-02-22T13:57:29.564559+00:00 WARNING kernel: [    9.604076] Modules linked in: cfg80211(+) iwl7000_cfg80211 iio_trig_sysfs cros_ec_sensors cros_ec_sensors_ring cros_ec_sensors_core industrialio_triggered_buffer kfifo_buf industrialio uvcvideo videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_core joydev
2018-02-22T13:57:29.564559+00:00 WARNING kernel: [    9.604106] CPU: 0 PID: 1486 Comm: modprobe Tainted: G     U          4.4.115-13124-g70545796f3e4 #1
2018-02-22T13:57:29.564560+00:00 WARNING kernel: [    9.604108] Hardware name: Google Reef/Reef, BIOS Google_Reef.9042.110.0 05/16/2017
2018-02-22T13:57:29.564561+00:00 WARNING kernel: [    9.604112]  0000000000000286 8d55746a0c031192 ffff880174957c00 ffffffffbb6fff82
2018-02-22T13:57:29.564562+00:00 WARNING kernel: [    9.604119]  ffff880174957c50 0000000000000000 ffff880174957c40 ffffffffbb46d091
2018-02-22T13:57:29.564562+00:00 WARNING kernel: [    9.604125]  0000001f74957cc0 ffff8801787eb000 ffff880178675b90 ffff88017b1ae618
2018-02-22T13:57:29.564563+00:00 WARNING kernel: [    9.604131] Call Trace:
2018-02-22T13:57:29.564564+00:00 WARNING kernel: [    9.604139]  [<ffffffffbb6fff82>] dump_stack+0x4d/0x63
2018-02-22T13:57:29.564565+00:00 WARNING kernel: [    9.604145]  [<ffffffffbb46d091>] __warn+0xca/0xe5
2018-02-22T13:57:29.564565+00:00 WARNING kernel: [    9.604149]  [<ffffffffbb46d194>] warn_slowpath_fmt+0x5a/0x76
2018-02-22T13:57:29.564566+00:00 WARNING kernel: [    9.604153]  [<ffffffffbb5ec42c>] sysfs_warn_dup+0x64/0x73
2018-02-22T13:57:29.564567+00:00 WARNING kernel: [    9.604156]  [<ffffffffbb5ec4e9>] sysfs_create_dir_ns+0x69/0x7b
2018-02-22T13:57:29.564568+00:00 WARNING kernel: [    9.604160]  [<ffffffffbb702623>] kobject_add_internal+0xd2/0x267
2018-02-22T13:57:29.564568+00:00 WARNING kernel: [    9.604164]  [<ffffffffbb7027de>] kset_register+0x26/0x3f
2018-02-22T13:57:29.564569+00:00 WARNING kernel: [    9.604170]  [<ffffffffbb8a566a>] __class_register+0xdd/0x178
2018-02-22T13:57:29.564570+00:00 WARNING kernel: [    9.604198]  [<ffffffffc02a170f>] wiphy_sysfs_init+0x1c/0x1e [cfg80211]
2018-02-22T13:57:29.564570+00:00 WARNING kernel: [    9.604224]  [<ffffffffc0304020>] cfg80211_init+0x20/0xd8 [cfg80211]
2018-02-22T13:57:29.564571+00:00 WARNING kernel: [    9.604228]  [<ffffffffc0304000>] ? 0xffffffffc0304000
2018-02-22T13:57:29.564572+00:00 WARNING kernel: [    9.604233]  [<ffffffffbb4004a9>] do_one_initcall+0x18c/0x1a1
2018-02-22T13:57:29.564573+00:00 WARNING kernel: [    9.604238]  [<ffffffffbb4c6c11>] do_init_module+0x5f/0x1cd
2018-02-22T13:57:29.564573+00:00 WARNING kernel: [    9.604243]  [<ffffffffbb4c83ee>] SYSC_finit_module+0x112b/0x11c8
2018-02-22T13:57:29.564574+00:00 WARNING kernel: [    9.604248]  [<ffffffffbb5803fd>] ? vm_mmap_pgoff+0x95/0xd3
2018-02-22T13:57:29.564575+00:00 WARNING kernel: [    9.604252]  [<ffffffffbb4c96fb>] SyS_finit_module+0xe/0x10
2018-02-22T13:57:29.564576+00:00 WARNING kernel: [    9.604258]  [<ffffffffbbbce88d>] entry_SYSCALL_64_fastpath+0x21/0x95
2018-02-22T13:57:29.564576+00:00 WARNING kernel: [    9.604262] ---[ end trace abc113a73efde9c3 ]---
2018-02-22T13:57:29.564577+00:00 WARNING kernel: [    9.604265] ------------[ cut here ]------------


This one's a little odd, since it's actually the standard 'cfg80211' that's being loaded during the failure (in kernel parlance, the '+' in 'cfg80211(+)' means "MODULE_STATE_COMING"); 'iwl7000_cfg80211' is already loaded.

And I'm actually thinking now that $subject bug isn't the primary reason the test failed though; IIUC the primary reason is that the PCI device wasn't detected (I think? at least, the 'lspci' results don't show any Wireless device I recognize). I think this might be an ongoing known issue?

So all in all, I'm not sure the $subject warning is directly causing "user" problems here. But it's a bit concerning still.
The following query on crash.corp.google.com shows several instances of the problem.

product.name='ChromeOS' AND EXISTS (SELECT 1 FROM UNNEST(productdata) WHERE Key='exec_name' AND Value='kernel-warning') AND stable_signature like '%sysfs_warn_dup%' AND product.Version >='10403.0.0'

As of right now (Monday 2/26/2018, 10am), this query reports 19 instances on three kernel versions (3.14, 3.18, and 4.4), all with the sysfs traceback as in #10. After installing a recent root file system (10428) onto caroline, the problem is observed as well. Interestingly, the traceback was no longer seen after installing a chromeos-4.14 kernel on the same system.

Same device as #10, but new test instance:

https://pantheon.corp.google.com/storage/browser/chromeos-autotest-results/179777095-chromeos-test/chromeos6-row3-rack12-host11

Same symptoms.

net.log suggests this device never had a Wifi device during this boot, and the stashed lspci seems to confirm that again.

I just logged into the device, and it still seems to have no Wifi.

Given I can't find a passing run for this device (searching tests.corp.google.com)...maybe this is just a defective unit. Filed a bug [1] to track that device.

[1] https://bugs.chromium.org/p/chromium/issues/detail?id=817530
#12: So if no wireless PCI hardware is detected, we try to load both instances of cfg80211 ?

Yeah, I don't understand that part. (We could try to fake it, I'm sure. Like, remove the PCI card from a system?)
Actually...that's exactly why we see this problem.

The real key is that the auto-loading of nl80211 in netlink's ctrl_getfamily():

static int ctrl_getfamily(struct sk_buff *skb, struct genl_info *info)
{
...
        if (info->attrs[CTRL_ATTR_FAMILY_NAME]) {
                char *name;

                name = nla_data(info->attrs[CTRL_ATTR_FAMILY_NAME]);
                res = genl_family_find_byname(name);
#ifdef CONFIG_MODULES
                if (res == NULL) {
                        genl_unlock();
                        up_read(&cb_lock);
                        request_module("net-pf-%d-proto-%d-family-%s",
                                       PF_NETLINK, NETLINK_GENERIC, name);
...

will actually trigger loading of *all* modules that match the alias 'net-pf-16-proto-16-family-nl80211'. And of course, both our cfg80211 modules match that property, by design:

# modinfo cfg80211                                                                                             
filename:       /lib/modules/4.4.117/kernel/net/wireless/cfg80211.ko
alias:          net-pf-16-proto-16-family-nl80211
...
# modinfo iwl7000_cfg80211                                                                                     
filename:       /lib/modules/4.4.117/kernel/drivers/net/wireless/iwl7000/wireless/iwl7000_cfg80211.ko
alias:          net-pf-16-proto-16-family-nl80211
...


That is, if we couldn't already find a nl80211 handler when the first nl80211 request is made, then the module loader will try to load any.

The reason we don't see this problem when we *do* have a Wifi device, is that if we have a Wifi device, then in the process of loading the corresponding Wifi driver, we load the corresponding cfg80211 module. By the time anyone gets around to making nl80211 requests, we already have support, and we never hit the NULL case for genl_family_find_byname().

---

Along the way of discovering this, I realized yet another way this is extremely fragile: the first call to nl80211 doesn't come from shill or any of our networking services; it comes from powerd. In particular, it comes from powerd/set_wifi_transmit_power.cc, which thinks it can handle tablet vs. clamshell TX power levels. This is yet another reason why we should pursue this:

https://issuetracker.google.com/73899191

and it also explains how we could see this complaint on systems where Wifi *is* working OK; the first nl80211 request tries to load both modules, and we just get lucky that the right one loads first.

Comment 16 by kirtika@google.com, Feb 28 2018

Brian: Sorry to bring up an old/already-smacked-down idea, but would adding the "alias cfg80211 iwl7000_cfg80211" in /etc/modprobe.d help in this case?
In other words, can we tell the kernel to not bother with cfg80211 if this variant is present on the system?

#16 would just add another bandage. The only suggestion I have seen that makes sense is to revert all related changes from all branches, have Intel fix up the series for chromeos-4.4 and chromeos-4.14 to keep the in-kernel version of cfg80211, and no longer try to keep the iwl7000 code in older kernels up to date (ie only fix severe security issues in lder kernels, but nothing else).
I'll admit I'm not super-familiar with modprobe.d config files, but I don't believe that will help. I think all that can do is *add* aliases, not actually remove or block aliases. The way I've seen aliases be useful would be for, e.g., to remove a proprietary graphics driver and completely replace it with the upstream one. Like, completely remove nvidia.ko from a desktop system, and then have 'alias nvidia nouveau'.

And anyway, the problematic loading methods won't be loading by module name; they're loading by netlink class name (e.g. "net-pf-16-proto-16-family-nl80211").

And to address what you might be suggesting: you could do the equivalent by just removing one module or the other entirely (no alias required, unless you think people have 'cfg80211' hardcoded somewhere). But then you get back to the same problems brought up before, about whether we support
(a) USB wireless (or any other "2nd-interface" solution)
(b) 2nd-source wireless (e.g., swap out Intel for non-Intel on different SKUs of the same model)

Comment 19 by kirtika@google.com, Mar 13 2018

Googlers only: 
https://crash.corp.google.com/browse?q=product.name%3D%27ChromeOS%27%20AND%20product.Version%3D%2710452.1.0%27%20AND%20STRPOS(stable_signature%2C%20%27sysfs_warn_dup%27)%20%3E%200

(Sample query to look up this crash - I am using 10452.1.0 - latest dev here, and it has 20 reports). 

Comment 20 by rajatja@google.com, Mar 16 2018

If possible, I'd like to see this in action. Does any one know of a recipe using which I can reproduce this issue on a system? I removed a wifi card from a soraka, and yet I do not see any issue on boot. I tried shill, it core dumped on me (assumingly because of failure to find wifi) but couldn't reproduce this issue. 

Comment 21 by rajatja@google.com, Mar 16 2018

(BTW, I was trying 4.4 in case it matters)
Try a convertible, where powerd plays with Wifi TX power. Caroline would do (3.18). I think Reef saw this problem too, in the lab, but that was with no Wifi (or at least, unreliable Wifi).
Project Member

Comment 23 by bugdroid1@chromium.org, Mar 17 2018

Labels: merge-merged-chromeos-4.4
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/476f7aec8dec2cc42d19af5ba3f1ac45299b6262

commit 476f7aec8dec2cc42d19af5ba3f1ac45299b6262
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 17 01:31:06 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

Signed-off-by: Rajat Jain <rajatja@google.com>
CQ-DEPEND=CL:963828
BUG= chromium:807315 
TEST=Tested for wifi on a Soraka, an Electro, and Kevin

Change-Id: Ia95a48133df80956a9e93e996b640a1e2b4f62c6
Reviewed-on: https://chromium-review.googlesource.com/963827
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/476f7aec8dec2cc42d19af5ba3f1ac45299b6262/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 24 by bugdroid1@chromium.org, Mar 17 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2

commit 8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 17 01:31:08 2018

CHROMIUM: configs: Drop CFG80211 from pineview and IWL7000 from others

This was generated like this:

./chromeos/scripts/kernelconfig olddefconfig
  (This disables IWL7000 from all configs because of previous CL,
   and because CFG_80211 is selected on all)

echo CONFIG_CFG80211=n >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

echo CONFIG_IWL7000=m >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

./chromeos/scripts/kernelconfig olddefconfig

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested wifi on Soraka, Kevin and Electro

Change-Id: I42baadab6b8d80937c226812a273238ee025022c
Reviewed-on: https://chromium-review.googlesource.com/963828
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/i386/common.config
[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/armel/common.config
[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/arm64/common.config
[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/base.config
[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/arm64/chromiumos-arm64.flavour.config
[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/x86_64/common.config
[modify] https://crrev.com/8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config

Project Member

Comment 25 by bugdroid1@chromium.org, Mar 17 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/a4b4797e9dddc4442e0c47cada4b3545b0a3d095

commit a4b4797e9dddc4442e0c47cada4b3545b0a3d095
Author: Brian Norris <briannorris@chromium.org>
Date: Sat Mar 17 01:31:04 2018

CHROMIUM: renormalize kernel configs

./chromeos/scripts/kernelconfig olddefconfig

DST_CACHE is 'select'ed from here:
e6454536ad45 ip_tunnel: replace dst_cache with generic implementation

Most of the Mali stuff is new (and disabled or BROKEN) configs from here:
c1e31cbace14 CHROMIUM: mali: update to r22p0

BUG= chromium:807315 
TEST=build

Change-Id: I5a911849a8929cb7d01d3ae62244cf2e569ff381
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/966793
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>

[modify] https://crrev.com/a4b4797e9dddc4442e0c47cada4b3545b0a3d095/chromeos/config/i386/common.config
[modify] https://crrev.com/a4b4797e9dddc4442e0c47cada4b3545b0a3d095/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/a4b4797e9dddc4442e0c47cada4b3545b0a3d095/chromeos/config/base.config
[modify] https://crrev.com/a4b4797e9dddc4442e0c47cada4b3545b0a3d095/chromeos/config/armel/chromiumos-rockchip.flavour.config
[modify] https://crrev.com/a4b4797e9dddc4442e0c47cada4b3545b0a3d095/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/a4b4797e9dddc4442e0c47cada4b3545b0a3d095/chromeos/config/arm64/chromiumos-rockchip64.flavour.config

Project Member

Comment 26 by bugdroid1@chromium.org, Mar 17 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/3e9cc1aa0b19cd8ee2b3d142fbabc97d605ee705

commit 3e9cc1aa0b19cd8ee2b3d142fbabc97d605ee705
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 17 17:42:22 2018

CHROMIUM: kernel config: Renormalize to include IWL7000_TESTMODE

This is done after removing the dependence from NL80211_TESTMODE

BUG= chromium:807315 
TEST=VErify iwlxvt gets built and can be loaded on Soraka
Signed-off-by: Rajat Jain <rajatja@google.com>

Change-Id: Iafc23b1c2810585bc13e70f32159b0b63c9e704d
Reviewed-on: https://chromium-review.googlesource.com/967375
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/3e9cc1aa0b19cd8ee2b3d142fbabc97d605ee705/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

Project Member

Comment 27 by bugdroid1@chromium.org, Mar 17 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/d6b8e7779567b50b4300d1dd506960583993429d

commit d6b8e7779567b50b4300d1dd506960583993429d
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 17 17:42:20 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

BUG= chromium:807315 
TEST=Tested iwlxvt.ko can be inserted on a Soraka
Signed-off-by: Rajat Jain <rajatja@google.com>

Change-Id: Id0b167351c927b16f199d7889bed92f5d48708a6
Reviewed-on: https://chromium-review.googlesource.com/967381
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/d6b8e7779567b50b4300d1dd506960583993429d/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 28 by bugdroid1@chromium.org, Mar 20 2018

Labels: merge-merged-chromeos-3.18
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/7e49272bda250ec364cf279829e19b7584696a43

commit 7e49272bda250ec364cf279829e19b7584696a43
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 00:04:45 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

Signed-off-by: Rajat Jain <rajatja@google.com>
CQ-DEPEND=CL:967017
BUG= chromium:807315 
TEST=Tested for wifi on a cyan

Change-Id: Ia95a48133df80956a9e93e996b640a1e2b4f62c6
Reviewed-on: https://chromium-review.googlesource.com/966989
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/7e49272bda250ec364cf279829e19b7584696a43/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 29 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/5d0b5fdb655aa2be6883ab80ebf77fca76495d32

commit 5d0b5fdb655aa2be6883ab80ebf77fca76495d32
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 00:04:43 2018

CHROMIUM: renormalize kernel configs

./chromeos/scripts/kernelconfig olddefconfig

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=build

Change-Id: I416d314bfc508c7a5a8da5051a2ec894e210889b
Reviewed-on: https://chromium-review.googlesource.com/967015
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/5d0b5fdb655aa2be6883ab80ebf77fca76495d32/chromeos/config/arm64/chromiumos-arm64.flavour.config
[modify] https://crrev.com/5d0b5fdb655aa2be6883ab80ebf77fca76495d32/chromeos/config/arm64/chromiumos-mediatek.flavour.config

Project Member

Comment 30 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ba3bfe039dfedf2e25f353c5e037dc3678315fea

commit ba3bfe039dfedf2e25f353c5e037dc3678315fea
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 00:04:49 2018

CHROMIUM: Renormalize after iwl7000 Kconfig changes

./chromeos/scripts/kernelconfig olddefconfig
(disables CONFIG_IWL7000 for all, due to Kconfig changes
in previous CL)

I'm not sure why DEV_COREDUMP CONFIG is removed by splitconfig
but Kirtika tells me that the only users are BT SDIO and wireless-4.2
none of whom are x86.

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested for wifi on a cyan

Change-Id: Ibb377d5c119a0605bb15db46e0c9f457c0502d78
Reviewed-on: https://chromium-review.googlesource.com/967016
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/ba3bfe039dfedf2e25f353c5e037dc3678315fea/chromeos/config/i386/common.config
[modify] https://crrev.com/ba3bfe039dfedf2e25f353c5e037dc3678315fea/chromeos/config/mips/chromiumos-mipsel.flavour.config
[modify] https://crrev.com/ba3bfe039dfedf2e25f353c5e037dc3678315fea/chromeos/config/armel/chromiumos-armada38x.flavour.config
[modify] https://crrev.com/ba3bfe039dfedf2e25f353c5e037dc3678315fea/chromeos/config/armel/chromiumos-ipq40xx.flavour.config
[modify] https://crrev.com/ba3bfe039dfedf2e25f353c5e037dc3678315fea/chromeos/config/arm64/chromiumos-tegra64.flavour.config
[modify] https://crrev.com/ba3bfe039dfedf2e25f353c5e037dc3678315fea/chromeos/config/x86_64/common.config

Project Member

Comment 31 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/d99a5b37a7d2b3a984993b8e7c6932971c0f262e

commit d99a5b37a7d2b3a984993b8e7c6932971c0f262e
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 00:04:51 2018

CHROMIUM: configs: Drop CFG80211 from pineview and select IWL7000

This was generated like this:

echo CONFIG_CFG80211=n >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

echo CONFIG_IWL7000=m >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

./chromeos/scripts/kernelconfig olddefconfig

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested wifi on a cyan

Change-Id: Ife449493320619d7efb5c49dc37c38e6b1b14b5f
Reviewed-on: https://chromium-review.googlesource.com/967017
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/d99a5b37a7d2b3a984993b8e7c6932971c0f262e/chromeos/config/mips/common.config
[modify] https://crrev.com/d99a5b37a7d2b3a984993b8e7c6932971c0f262e/chromeos/config/i386/common.config
[modify] https://crrev.com/d99a5b37a7d2b3a984993b8e7c6932971c0f262e/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/d99a5b37a7d2b3a984993b8e7c6932971c0f262e/chromeos/config/armel/common.config
[modify] https://crrev.com/d99a5b37a7d2b3a984993b8e7c6932971c0f262e/chromeos/config/arm64/common.config
[modify] https://crrev.com/d99a5b37a7d2b3a984993b8e7c6932971c0f262e/chromeos/config/base.config
[modify] https://crrev.com/d99a5b37a7d2b3a984993b8e7c6932971c0f262e/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/d99a5b37a7d2b3a984993b8e7c6932971c0f262e/chromeos/config/x86_64/common.config

Project Member

Comment 32 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/8a199d32192e2fd3b34a886f9739a8471c3e401b

commit 8a199d32192e2fd3b34a886f9739a8471c3e401b
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 00:04:47 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

BUG= chromium:807315 
TEST=Tested no depmod errors on a cyan
Signed-off-by: Rajat Jain <rajatja@google.com>

Change-Id: Id0b167351c927b16f199d7889bed92f5d48708a6
Reviewed-on: https://chromium-review.googlesource.com/967366
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/8a199d32192e2fd3b34a886f9739a8471c3e401b/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 33 by bugdroid1@chromium.org, Mar 20 2018

Labels: merge-merged-chromeos-3.14
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/90e08e2c0c62f7d6ab1f47acafd3e99d02293881

commit 90e08e2c0c62f7d6ab1f47acafd3e99d02293881
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 02:21:47 2018

CHROMIUM: Renormalize Kernel configs

Use the following command:
./chromeos/scripts/kernelconfig oldconfig

And choose default options for all

BUG= chromium:807315 
TEST=Build

Change-Id: I1a1587f1665d0fd47eaa850ea50ca1ce9ae2e6cb
Signed-off-by: Rajat Jain <rajatj@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967419
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/90e08e2c0c62f7d6ab1f47acafd3e99d02293881/chromeos/config/armel/chromiumos-rockchip.flavour.config
[modify] https://crrev.com/90e08e2c0c62f7d6ab1f47acafd3e99d02293881/chromeos/config/x86_64/common.config
[modify] https://crrev.com/90e08e2c0c62f7d6ab1f47acafd3e99d02293881/chromeos/config/i386/common.config
[modify] https://crrev.com/90e08e2c0c62f7d6ab1f47acafd3e99d02293881/chromeos/config/base.config

Project Member

Comment 34 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/4c731608dfa549ed5a6774aa4f2fcac4341f8e63

commit 4c731608dfa549ed5a6774aa4f2fcac4341f8e63
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 04:34:18 2018

CHROMIUM: Renormalize after iwl7000 Kconfig changes

./chromeos/scripts/kernelconfig oldconfig
(Choose default options - Deletes iwl7000 from all configs)

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested for wifi on a Samus

Change-Id: I3a2904cd60f640f9aad99d70828265d40c3487eb
Reviewed-on: https://chromium-review.googlesource.com/966975
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/4c731608dfa549ed5a6774aa4f2fcac4341f8e63/chromeos/config/x86_64/common.config
[modify] https://crrev.com/4c731608dfa549ed5a6774aa4f2fcac4341f8e63/chromeos/config/i386/common.config
[modify] https://crrev.com/4c731608dfa549ed5a6774aa4f2fcac4341f8e63/chromeos/config/armel/chromiumos-ipq806x.flavour.config
[modify] https://crrev.com/4c731608dfa549ed5a6774aa4f2fcac4341f8e63/chromeos/config/mips/chromiumos-mipsel.flavour.config

Project Member

Comment 35 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/5f25edd9bd45385dae504992925670036478ba11

commit 5f25edd9bd45385dae504992925670036478ba11
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 04:34:14 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

Signed-off-by: Rajat Jain <rajatja@google.com>
CQ-DEPEND=CL:967441
BUG= chromium:807315 
TEST=Tested for wifi on a Samus

Change-Id: Ia95a48133df80956a9e93e996b640a1e2b4f62c6
Reviewed-on: https://chromium-review.googlesource.com/967382
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/5f25edd9bd45385dae504992925670036478ba11/drivers/net/wireless/iwl7000/Kconfig
[modify] https://crrev.com/5f25edd9bd45385dae504992925670036478ba11/drivers/net/wireless-3.8/iwl7000/Kconfig

Project Member

Comment 36 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/b00e05df5db97ba870c676d0f268afabbd046586

commit b00e05df5db97ba870c676d0f268afabbd046586
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 04:34:16 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

BUG= chromium:807315 
TEST=Verified iwlxvk.ko loading on a samus
Signed-off-by: Rajat Jain <rajatja@google.com>

Change-Id: Id0b167351c927b16f199d7889bed92f5d48708a6
Reviewed-on: https://chromium-review.googlesource.com/967383
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/b00e05df5db97ba870c676d0f268afabbd046586/drivers/net/wireless/iwl7000/Kconfig
[modify] https://crrev.com/b00e05df5db97ba870c676d0f268afabbd046586/drivers/net/wireless-3.8/iwl7000/Kconfig

Project Member

Comment 37 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea

commit 22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea
Author: Rajat Jain <rajatja@google.com>
Date: Tue Mar 20 04:34:20 2018

CHROMIUM: configs: Drop CFG80211 from pineview and IWL7000 from others

This was generated like this:

echo CONFIG_CFG80211=n >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

echo CONFIG_IWL7000=m >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

./chromeos/scripts/kernelconfig oldconfig
(And select default configurations for everything)

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested wifi on a samus

Change-Id: I153c9b08a065a5bb05f52849879fc14ed7650dc7
Reviewed-on: https://chromium-review.googlesource.com/967441
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea/chromeos/config/mips/common.config
[modify] https://crrev.com/22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea/chromeos/config/i386/common.config
[modify] https://crrev.com/22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea/chromeos/config/armel/common.config
[modify] https://crrev.com/22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea/chromeos/config/arm64/common.config
[modify] https://crrev.com/22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea/chromeos/config/base.config
[modify] https://crrev.com/22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea/chromeos/config/x86_64/common.config

Project Member

Comment 38 by bugdroid1@chromium.org, Mar 20 2018

Labels: merge-merged-chromeos-4.14
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/d3e8f1ca94205f604593c520602aa41b4308a921

commit d3e8f1ca94205f604593c520602aa41b4308a921
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Tue Mar 20 14:24:13 2018

CHROMIUM: config: renormalize configs

Run ./chromeos/scripts/kernelconfig olddefconfig

BUG= chromium:807315 
TEST=build and boot on meowth, compare resulting kernel
     config after `modprobe configs; cat /boot/config*`
     is same as before this patch

Change-Id: Ib9760571027c174be8f685566341a6abc977f4dd
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967622
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/d3e8f1ca94205f604593c520602aa41b4308a921/chromeos/config/x86_64/common.config
[modify] https://crrev.com/d3e8f1ca94205f604593c520602aa41b4308a921/chromeos/config/i386/common.config

Project Member

Comment 39 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/edf68bf3aec0f754dabdc6ad88fcb790712d6f37

commit edf68bf3aec0f754dabdc6ad88fcb790712d6f37
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Tue Mar 20 14:24:15 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

BUG= chromium:807315 
TEST=Build, boot on meowth, test wifi works

Change-Id: I234825e9764c0b19e6415873eef1c60792103a5c
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967623
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/edf68bf3aec0f754dabdc6ad88fcb790712d6f37/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 40 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ea44d6ee6d3ef5311d68b8a98571448a8cc2ea3b

commit ea44d6ee6d3ef5311d68b8a98571448a8cc2ea3b
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Tue Mar 20 14:24:18 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

BUG= chromium:807315 
TEST=Build and boot on meowth, check for iwlxvt working

Change-Id: Ic9bf48cbe24a4c2decbab33435b4d467504909a2
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967624
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/ea44d6ee6d3ef5311d68b8a98571448a8cc2ea3b/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 41 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/a2fcd62602b8ae6406adc900a653676f91b06d86

commit a2fcd62602b8ae6406adc900a653676f91b06d86
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Tue Mar 20 14:24:20 2018

CHROMIUM: Renormalize after iwl7000 Kconfig changes

./chromeos/scripts/kernelconfig olddefconfig
(disables CONFIG_IWL7000 for all, due to Kconfig changes
in previous CL)

BUG= chromium:807315 
TEST=Build and boot on meowth

Change-Id: I84050667a41b718a9d2ce1d40aca80b4632ba479
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967625
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/a2fcd62602b8ae6406adc900a653676f91b06d86/chromeos/config/i386/common.config
[modify] https://crrev.com/a2fcd62602b8ae6406adc900a653676f91b06d86/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/a2fcd62602b8ae6406adc900a653676f91b06d86/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/a2fcd62602b8ae6406adc900a653676f91b06d86/chromeos/config/arm64/chromiumos-arm64.flavour.config
[modify] https://crrev.com/a2fcd62602b8ae6406adc900a653676f91b06d86/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
[modify] https://crrev.com/a2fcd62602b8ae6406adc900a653676f91b06d86/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config

Project Member

Comment 42 by bugdroid1@chromium.org, Mar 20 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/c4a03cfbfe50b427b0218d39967efb9a77eeaebc

commit c4a03cfbfe50b427b0218d39967efb9a77eeaebc
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Tue Mar 20 14:24:23 2018

CHROMIUM: config: Drop CFG80211 from pineview and select IWL7000

Generated with:

echo CONFIG_CFG80211=n >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

echo CONFIG_IWL7000=m >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

./chromeos/scripts/kernelconfig olddefconfig

BUG= chromium:807315 
TEST=Build and boot on meowth, test wifi

Change-Id: I4221efd7f66c4aa39973c7615c327e64af1fbcc6
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967626
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/c4a03cfbfe50b427b0218d39967efb9a77eeaebc/chromeos/config/i386/common.config
[modify] https://crrev.com/c4a03cfbfe50b427b0218d39967efb9a77eeaebc/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/c4a03cfbfe50b427b0218d39967efb9a77eeaebc/chromeos/config/armel/common.config
[modify] https://crrev.com/c4a03cfbfe50b427b0218d39967efb9a77eeaebc/chromeos/config/arm64/common.config
[modify] https://crrev.com/c4a03cfbfe50b427b0218d39967efb9a77eeaebc/chromeos/config/base.config
[modify] https://crrev.com/c4a03cfbfe50b427b0218d39967efb9a77eeaebc/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/c4a03cfbfe50b427b0218d39967efb9a77eeaebc/chromeos/config/x86_64/common.config
[modify] https://crrev.com/c4a03cfbfe50b427b0218d39967efb9a77eeaebc/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config

Project Member

Comment 43 by bugdroid1@chromium.org, Mar 21 2018

Labels: merge-merged-chromeos-3.8
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/8989a3276fa295c1ae506d13405827de6b5ad19f

commit 8989a3276fa295c1ae506d13405827de6b5ad19f
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Wed Mar 21 09:23:45 2018

CHROMIUM: config: renormalize configs

Run ./chromeos/scripts/kernelconfig oldconfig
and accept all defaults.

BUG= chromium:807315 
TEST=build and run tryjob on falco_li

Change-Id: If290e0062d9c66dcd2771e9cf4f1edd26db7a822
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967904
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/8989a3276fa295c1ae506d13405827de6b5ad19f/chromeos/config/armel/chromeos-exynos5.flavour.config
[modify] https://crrev.com/8989a3276fa295c1ae506d13405827de6b5ad19f/chromeos/config/base.config

Comment 44 by rajatja@google.com, Mar 21 2018

Here is the update so far.

This is the current cause of warnings:

powerd
->set_wifi_transmit_power
  ->attempts to talk to NL80211 socket
    ->calls request_module for net-pf-16-proto-16-family-nl80211 (in kernelspace)
      ->call_usermode_helper (for modprobe)
        ->modprobe sees 2 modules registered with the same alias net-pf-16-proto-16-family-nl80211
          -> attempts to load them both. And thus throws up warnings.

But I'd imagine that the warnings may come up in other use cases also because eventually both the modules alias to the same net-pf-16-proto-16-family-nl80211.

1) The order in which the modules are loaded (at least on a caroline that I tried) seems determinate in that it is always trying to load the iwl7000_cfg80211 first, even if I swap the entries for the two modules in modules.alias (I was thinking it depends on the order of entry in this file).

2) modprobe seems to allow disabling and blacklisting of modules. This may help if we can use it at boot time to disable one of the modules, although it seems that most of this requires writing to some config files, so we need to see how that plays out with out (mostly) read only file system.
https://linux-audit.com/kernel-hardening-disable-and-blacklist-linux-modules/

3) Even if we are able to achieve (2), we're going to break the use cases of some one wanting to use a USB wifi [e.g. if the intel wifi shows up but possibly not working because of some issue.]
Project Member

Comment 45 by bugdroid1@chromium.org, Mar 21 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/304d44c08264e3764256dc78cdc8d6dc3f406dd8

commit 304d44c08264e3764256dc78cdc8d6dc3f406dd8
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Wed Mar 21 11:39:32 2018

cros-kernel2: Add config fragment to use Intel wifi stack

The Intel wireless module pulls along with it a variant of cfg80211,
which conflicts with stock cfg80211. Add a config fragment to enable
Intel wifi and disable stock cfg80211. Boards with Intel wifi can then
use the USE flag "intelwifi38" to make this config change.

CQ-DEPEND=CL:968023
BUG= chromium:807315 
TEST=Build and run tryjobs on tricky, mccloud and falco_li (CL:*59061)
     Check that wifi works like before on each.
     Build and run tryjobs on panther and stumpy.

Change-Id: I7fc026f92eb01c526f1eec5914130aa5cd7cd97a
Reviewed-on: https://chromium-review.googlesource.com/969201
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/304d44c08264e3764256dc78cdc8d6dc3f406dd8/eclass/cros-kernel2.eclass

Project Member

Comment 46 by bugdroid1@chromium.org, Mar 21 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/fd53b14db6df886415c3e1a20477224b22d6ff17

commit fd53b14db6df886415c3e1a20477224b22d6ff17
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Wed Mar 21 11:39:29 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

CQ-DEPEND=CL:967904, CL:969301
BUG= chromium:807315 
TEST=(TBD) Build and run tryjob on falco_li, tricky, mccloud

Change-Id: Idfb7b195c734628b86d86e850a4e4bfbeef1bf2b
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/968021
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/fd53b14db6df886415c3e1a20477224b22d6ff17/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 47 by bugdroid1@chromium.org, Mar 21 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/2079d93d86828a3e0762cb2499153ab29410f08f

commit 2079d93d86828a3e0762cb2499153ab29410f08f
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Wed Mar 21 11:39:31 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

CQ-DEPEND=CL:968021
BUG= chromium:807315 
TEST=(TBD) build, run tryjob on falco_li, tricky, mccloud,
     load iwlxvt and confirm rservice starts correctly.

Change-Id: I3fb3219c89eb0579be92fb8ffd5752dad86a0d58
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/968022
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/2079d93d86828a3e0762cb2499153ab29410f08f/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 48 by bugdroid1@chromium.org, Mar 21 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/189058544cc0abf10b7185e61bc6c2c899234a27

commit 189058544cc0abf10b7185e61bc6c2c899234a27
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Wed Mar 21 11:39:35 2018

CHROMIUM: config: renormalize config after iwl7000 changes

./chromeos/scripts/kernelconfig oldconfig
and accept all defaults.
(disables CONFIG_IWL7000 for all, due to Kconfig changes
in previous CL)

CQ-DEPEND=CL:968022
BUG= chromium:807315 
TEST=None.

Change-Id: I6409124b48bd06dbee2e8f5b531ed6c1f1f6657c
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/968023
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/189058544cc0abf10b7185e61bc6c2c899234a27/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/189058544cc0abf10b7185e61bc6c2c899234a27/chromeos/config/i386/common.config
[modify] https://crrev.com/189058544cc0abf10b7185e61bc6c2c899234a27/chromeos/config/x86_64/chromiumos-x86_64.flavour.config

Project Member

Comment 49 by bugdroid1@chromium.org, Mar 21 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/board-overlays/+/7b0b9b7360b2ed6ccbfd140cc37e99963fe21309

commit 7b0b9b7360b2ed6ccbfd140cc37e99963fe21309
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Wed Mar 21 11:39:33 2018

tricky: Add use flag to use Intel wireless stack.

The Intel wireless module pulls along with it a variant of cfg80211,
which conflicts with stock cfg80211.
Use the "intelwifi38" use flag to enable CONFIG_IWL7000 and disable
stock CFG80211 module.

CQ-DEPEND=CL:969201
BUG= chromium:807315 
TEST=Build and run tryjobs on tricky, mccloud and falco_li (CL:*591061)
     Check that wifi works like before on each.

Change-Id: I0431ba848919d088be480bb91a561a9db219550d
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/969301
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/7b0b9b7360b2ed6ccbfd140cc37e99963fe21309/overlay-tricky/profiles/base/make.defaults

Project Member

Comment 50 by bugdroid1@chromium.org, Mar 21 2018

Cc: rajatja@chromium.org
Labels: -Pri-2 M-66 Merge-Request-66 Pri-1
Owner: briannorris@chromium.org
Status: Started (was: Available)
Multiple people (Rajat, Kirtika and I) have been getting this unwound. I guess we might as well have some owner though...

Fixes are in M67, but we really need to come up with better solutions long-term. We'd also like to get this into M66, given that M65 and M66 both already have boot performance regressions [1], and are potentially susceptible to real failures as a result of this (we think everyone is essentially getting lucky, based on implementation details that load the "right" module first).

IMO, this is not highly risky; we are removing unused Wifi drivers and then reverting to pre-M65 boot order. With this solution, if Wifi works at all, there should be very little other room for failure. If we can't catch broken Wifi in testing...then our testing is pretty abysmal.

There are other ways to resolve this that might look smaller in terms of lines of code, but they are conceptually more complex (with more room for failure).

[1] https://bugs.chromium.org/p/chromium/issues/detail?id=810696
    https://bugs.chromium.org/p/chromium/issues/detail?id=822485
Project Member

Comment 52 by sheriffbot@chromium.org, Mar 22 2018

Labels: -Merge-Request-66 Merge-Review-66 Hotlist-Merge-Review
This bug requires manual review: M66 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: cmasso@(Android), cmasso@(iOS), josafat@(ChromeOS), abdulsyed@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot
Summary: iwl7000 messing up sysfs (was: chromeos-4.14: iwl7000 messing up sysfs)
Correcting subject. This affects all kernels.

Comment 54 by rajatja@google.com, Mar 22 2018

I'm working on a CL that I hope to complete by today (card detectiong logic is missing):

https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/975995 

I'd suggest if we can wait for this to land and pick this instead, that might cause lesser code churn in release branches. 

Comment 55 by josa...@google.com, Mar 23 2018

Cc: harpreet@chromium.org dchan@chromium.org
Are you going to be able to validate/bake CL in ToT?

We should get some explicit ToT validation before merge too
+hapreet/dchan 

Comment 56 by rajatja@google.com, Mar 23 2018

Based on the review comments, I think this is going to run into "security reviews". So I don't think this is going to land soon. I'm now also tempted to try more approaches given that both Brian and frysinger don't seem very convinced with this solution. So if we want this fixed in R66, we should go with the Cls Kirtika has. 

Side note, I'm thinking of removing module alias from both the modules, having a single module that aliases to the netlink, and have that module decide on runtime which one to request_module(). Thoughts? 

Comment 57 by rajatja@google.com, Mar 23 2018

I'm abandoning the blacklisting approach, because as discussed in the meeting today, the agreement is to:

1) Have Intel not include the cfg80211 in their driver starting R68.
2) For R65, R66, R67, we live with the current work around i.e. build only one of the cfg80211 modules at build time.

Project Member

Comment 58 by bugdroid1@chromium.org, Mar 23 2018

Labels: merge-merged-release-R66-10452.B-chromeos-3.18
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/17e6e9007d5af84adfa302733a8db6d1a87cb016

commit 17e6e9007d5af84adfa302733a8db6d1a87cb016
Author: Rajat Jain <rajatja@google.com>
Date: Fri Mar 23 23:10:16 2018

CHROMIUM: renormalize kernel configs

./chromeos/scripts/kernelconfig olddefconfig

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=build

Reviewed-on: https://chromium-review.googlesource.com/967015
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Change-Id: I416d314bfc508c7a5a8da5051a2ec894e210889b
Reviewed-on: https://chromium-review.googlesource.com/970921
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/17e6e9007d5af84adfa302733a8db6d1a87cb016/chromeos/config/i386/chromiumos-i386.flavour.config
[modify] https://crrev.com/17e6e9007d5af84adfa302733a8db6d1a87cb016/chromeos/config/x86_64/common.config
[modify] https://crrev.com/17e6e9007d5af84adfa302733a8db6d1a87cb016/chromeos/config/i386/common.config
[modify] https://crrev.com/17e6e9007d5af84adfa302733a8db6d1a87cb016/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config
[modify] https://crrev.com/17e6e9007d5af84adfa302733a8db6d1a87cb016/chromeos/config/base.config

Project Member

Comment 59 by bugdroid1@chromium.org, Mar 23 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/bcdb5eec766b93f3eb9657363b0ef65c00aebc73

commit bcdb5eec766b93f3eb9657363b0ef65c00aebc73
Author: Rajat Jain <rajatja@google.com>
Date: Fri Mar 23 23:14:21 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

Signed-off-by: Rajat Jain <rajatja@google.com>
CQ-DEPEND=CL:972791
BUG= chromium:807315 
TEST=Tested for wifi on a cyan

Change-Id: Ia95a48133df80956a9e93e996b640a1e2b4f62c6
Reviewed-on: https://chromium-review.googlesource.com/966989
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit 7e49272bda250ec364cf279829e19b7584696a43)
Reviewed-on: https://chromium-review.googlesource.com/970922
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Rajat Jain <rajatja@chromium.org>

[modify] https://crrev.com/bcdb5eec766b93f3eb9657363b0ef65c00aebc73/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 60 by bugdroid1@chromium.org, Mar 23 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ac4f7111e554f3ceeb39eb53672ad22c78cfea70

commit ac4f7111e554f3ceeb39eb53672ad22c78cfea70
Author: Rajat Jain <rajatja@google.com>
Date: Fri Mar 23 23:14:23 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

BUG= chromium:807315 
TEST=Tested no depmod errors on a cyan
Signed-off-by: Rajat Jain <rajatja@google.com>

Change-Id: Id0b167351c927b16f199d7889bed92f5d48708a6
Reviewed-on: https://chromium-review.googlesource.com/967366
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit 8a199d32192e2fd3b34a886f9739a8471c3e401b)
Reviewed-on: https://chromium-review.googlesource.com/970923
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/ac4f7111e554f3ceeb39eb53672ad22c78cfea70/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 61 by bugdroid1@chromium.org, Mar 23 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/bf0385f0f8d83f2d3528fd7c825c13fabd970da0

commit bf0385f0f8d83f2d3528fd7c825c13fabd970da0
Author: Rajat Jain <rajatja@google.com>
Date: Fri Mar 23 23:14:25 2018

CHROMIUM: Renormalize after iwl7000 Kconfig changes

./chromeos/scripts/kernelconfig olddefconfig
(disables CONFIG_IWL7000 for all, due to Kconfig changes
in previous CL)

I'm not sure why DEV_COREDUMP CONFIG is removed by splitconfig
but Kirtika tells me that the only users are BT SDIO and wireless-4.2
none of whom are x86.

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested for wifi on a cyan

Change-Id: Ibb377d5c119a0605bb15db46e0c9f457c0502d78
Reviewed-on: https://chromium-review.googlesource.com/967016
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit ba3bfe039dfedf2e25f353c5e037dc3678315fea)
Reviewed-on: https://chromium-review.googlesource.com/970924
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/bf0385f0f8d83f2d3528fd7c825c13fabd970da0/chromeos/config/i386/common.config
[modify] https://crrev.com/bf0385f0f8d83f2d3528fd7c825c13fabd970da0/chromeos/config/mips/chromiumos-mipsel.flavour.config
[modify] https://crrev.com/bf0385f0f8d83f2d3528fd7c825c13fabd970da0/chromeos/config/armel/chromiumos-armada38x.flavour.config
[modify] https://crrev.com/bf0385f0f8d83f2d3528fd7c825c13fabd970da0/chromeos/config/armel/chromiumos-ipq40xx.flavour.config
[modify] https://crrev.com/bf0385f0f8d83f2d3528fd7c825c13fabd970da0/chromeos/config/arm64/chromiumos-tegra64.flavour.config
[modify] https://crrev.com/bf0385f0f8d83f2d3528fd7c825c13fabd970da0/chromeos/config/x86_64/common.config

Project Member

Comment 62 by bugdroid1@chromium.org, Mar 23 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/eb52c6ed3b04342180cb3180d00d7739c3ba2cc5

commit eb52c6ed3b04342180cb3180d00d7739c3ba2cc5
Author: Rajat Jain <rajatja@google.com>
Date: Fri Mar 23 23:14:27 2018

CHROMIUM: configs: Drop CFG80211 from pineview and select IWL7000

This was generated like this:

echo CONFIG_CFG80211=n >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

echo CONFIG_IWL7000=m >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

./chromeos/scripts/kernelconfig olddefconfig

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested wifi on a cyan

Change-Id: Ife449493320619d7efb5c49dc37c38e6b1b14b5f
Reviewed-on: https://chromium-review.googlesource.com/967017
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit d99a5b37a7d2b3a984993b8e7c6932971c0f262e)
Reviewed-on: https://chromium-review.googlesource.com/972791
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/eb52c6ed3b04342180cb3180d00d7739c3ba2cc5/chromeos/config/mips/common.config
[modify] https://crrev.com/eb52c6ed3b04342180cb3180d00d7739c3ba2cc5/chromeos/config/i386/common.config
[modify] https://crrev.com/eb52c6ed3b04342180cb3180d00d7739c3ba2cc5/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/eb52c6ed3b04342180cb3180d00d7739c3ba2cc5/chromeos/config/armel/common.config
[modify] https://crrev.com/eb52c6ed3b04342180cb3180d00d7739c3ba2cc5/chromeos/config/arm64/common.config
[modify] https://crrev.com/eb52c6ed3b04342180cb3180d00d7739c3ba2cc5/chromeos/config/base.config
[modify] https://crrev.com/eb52c6ed3b04342180cb3180d00d7739c3ba2cc5/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/eb52c6ed3b04342180cb3180d00d7739c3ba2cc5/chromeos/config/x86_64/common.config

Project Member

Comment 63 by bugdroid1@chromium.org, Mar 24 2018

Labels: merge-merged-release-R66-10452.B-chromeos-4.14
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/90bde2dd8aa11f3a1d17aa7bc4f06b07a8fd0f04

commit 90bde2dd8aa11f3a1d17aa7bc4f06b07a8fd0f04
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Sat Mar 24 00:17:57 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

BUG= chromium:807315 
TEST=Build, boot on meowth, test wifi works

Change-Id: I234825e9764c0b19e6415873eef1c60792103a5c
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967623
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit edf68bf3aec0f754dabdc6ad88fcb790712d6f37)
Reviewed-on: https://chromium-review.googlesource.com/972768
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/90bde2dd8aa11f3a1d17aa7bc4f06b07a8fd0f04/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 64 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/b0cbf63a40cc6cab81d9f6d5240a75b1d074daa8

commit b0cbf63a40cc6cab81d9f6d5240a75b1d074daa8
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Sat Mar 24 00:18:09 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

BUG= chromium:807315 
TEST=Build and boot on meowth, check for iwlxvt working

Change-Id: Ic9bf48cbe24a4c2decbab33435b4d467504909a2
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967624
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit ea44d6ee6d3ef5311d68b8a98571448a8cc2ea3b)
Reviewed-on: https://chromium-review.googlesource.com/972769
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/b0cbf63a40cc6cab81d9f6d5240a75b1d074daa8/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 65 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/315b595c89a00db86a00eca5710b35352023d57b

commit 315b595c89a00db86a00eca5710b35352023d57b
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Sat Mar 24 00:22:58 2018

CHROMIUM: Renormalize after iwl7000 Kconfig changes

./chromeos/scripts/kernelconfig olddefconfig
(disables CONFIG_IWL7000 for all, due to Kconfig changes
in previous CL)

BUG= chromium:807315 
TEST=Build and boot on meowth

Change-Id: I84050667a41b718a9d2ce1d40aca80b4632ba479
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967625
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit a2fcd62602b8ae6406adc900a653676f91b06d86)
Reviewed-on: https://chromium-review.googlesource.com/972770
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/315b595c89a00db86a00eca5710b35352023d57b/chromeos/config/i386/common.config
[modify] https://crrev.com/315b595c89a00db86a00eca5710b35352023d57b/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/315b595c89a00db86a00eca5710b35352023d57b/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/315b595c89a00db86a00eca5710b35352023d57b/chromeos/config/arm64/chromiumos-arm64.flavour.config
[modify] https://crrev.com/315b595c89a00db86a00eca5710b35352023d57b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
[modify] https://crrev.com/315b595c89a00db86a00eca5710b35352023d57b/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config

Project Member

Comment 66 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/e61aa5e572c62933c1b0ee9090bae138ce80f149

commit e61aa5e572c62933c1b0ee9090bae138ce80f149
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Sat Mar 24 00:23:01 2018

CHROMIUM: config: Drop CFG80211 from pineview and select IWL7000

Generated with:

echo CONFIG_CFG80211=n >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

echo CONFIG_IWL7000=m >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

./chromeos/scripts/kernelconfig olddefconfig

BUG= chromium:807315 
TEST=Build and boot on meowth, test wifi

Change-Id: I4221efd7f66c4aa39973c7615c327e64af1fbcc6
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/967626
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit c4a03cfbfe50b427b0218d39967efb9a77eeaebc)
Reviewed-on: https://chromium-review.googlesource.com/972771
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/e61aa5e572c62933c1b0ee9090bae138ce80f149/chromeos/config/i386/common.config
[modify] https://crrev.com/e61aa5e572c62933c1b0ee9090bae138ce80f149/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/e61aa5e572c62933c1b0ee9090bae138ce80f149/chromeos/config/armel/common.config
[modify] https://crrev.com/e61aa5e572c62933c1b0ee9090bae138ce80f149/chromeos/config/arm64/common.config
[modify] https://crrev.com/e61aa5e572c62933c1b0ee9090bae138ce80f149/chromeos/config/base.config
[modify] https://crrev.com/e61aa5e572c62933c1b0ee9090bae138ce80f149/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/e61aa5e572c62933c1b0ee9090bae138ce80f149/chromeos/config/x86_64/common.config
[modify] https://crrev.com/e61aa5e572c62933c1b0ee9090bae138ce80f149/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config

Project Member

Comment 67 by bugdroid1@chromium.org, Mar 24 2018

Labels: merge-merged-release-R66-10452.B-chromeos-4.4
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ecbcb2e3b5d2f83db6c5ef5e5d70907e8423b39f

commit ecbcb2e3b5d2f83db6c5ef5e5d70907e8423b39f
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Sat Mar 24 01:01:55 2018

CHROMIUM: renormalize kernel configs

./chromeos/scripts/kernelconfig olddefconfig

DST_CACHE is 'select'ed from here:
e6454536ad45 ip_tunnel: replace dst_cache with generic implementation

BUG= chromium:807315 
TEST=trybot on reef, eve, kevin

Change-Id: Ia6eed262f34717b70a3b4bdc5672026f16e38da2
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/972783
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/ecbcb2e3b5d2f83db6c5ef5e5d70907e8423b39f/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/ecbcb2e3b5d2f83db6c5ef5e5d70907e8423b39f/chromeos/config/i386/common.config
[modify] https://crrev.com/ecbcb2e3b5d2f83db6c5ef5e5d70907e8423b39f/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/ecbcb2e3b5d2f83db6c5ef5e5d70907e8423b39f/chromeos/config/base.config

Project Member

Comment 68 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/abd316b458fae7b16304686a3b9e557b5703b9b5

commit abd316b458fae7b16304686a3b9e557b5703b9b5
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 01:02:07 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

Signed-off-by: Rajat Jain <rajatja@google.com>
CQ-DEPEND=CL:972785
BUG= chromium:807315 
TEST=Tested for wifi on a Soraka, an Electro, and Kevin

Change-Id: Ia95a48133df80956a9e93e996b640a1e2b4f62c6
Reviewed-on: https://chromium-review.googlesource.com/963827
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit 476f7aec8dec2cc42d19af5ba3f1ac45299b6262)
Reviewed-on: https://chromium-review.googlesource.com/972784
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/abd316b458fae7b16304686a3b9e557b5703b9b5/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 69 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/5210fe297bac14437d4fae6071d24afaf4a7a262

commit 5210fe297bac14437d4fae6071d24afaf4a7a262
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 01:02:32 2018

CHROMIUM: configs: Drop CFG80211 from pineview and IWL7000 from others

This was generated like this:

./chromeos/scripts/kernelconfig olddefconfig
  (This disables IWL7000 from all configs because of previous CL,
   and because CFG_80211 is selected on all)

echo CONFIG_CFG80211=n >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

echo CONFIG_IWL7000=m >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

./chromeos/scripts/kernelconfig olddefconfig

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested wifi on Soraka, Kevin and Electro

Change-Id: I42baadab6b8d80937c226812a273238ee025022c
Reviewed-on: https://chromium-review.googlesource.com/963828
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit 8f1c1b16caffdd081a3a86f77f08bfe7a9ad71e2)
Reviewed-on: https://chromium-review.googlesource.com/972785
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Rajat Jain <rajatja@chromium.org>

[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/i386/common.config
[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/armel/common.config
[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/arm64/common.config
[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/base.config
[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/arm64/chromiumos-arm64.flavour.config
[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/x86_64/common.config
[modify] https://crrev.com/5210fe297bac14437d4fae6071d24afaf4a7a262/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config

Project Member

Comment 70 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/0174eeece13ac2f0ef8f32b0c743d1ce6f1ad5b1

commit 0174eeece13ac2f0ef8f32b0c743d1ce6f1ad5b1
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 01:02:52 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

BUG= chromium:807315 
TEST=Tested iwlxvt.ko can be inserted on a Soraka
Signed-off-by: Rajat Jain <rajatja@google.com>

Change-Id: Id0b167351c927b16f199d7889bed92f5d48708a6
Reviewed-on: https://chromium-review.googlesource.com/967381
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
(cherry picked from commit d6b8e7779567b50b4300d1dd506960583993429d)
Reviewed-on: https://chromium-review.googlesource.com/972786
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/0174eeece13ac2f0ef8f32b0c743d1ce6f1ad5b1/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 71 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/0dda4e8c2b6362011de001d0aff05e91f8aa4c72

commit 0dda4e8c2b6362011de001d0aff05e91f8aa4c72
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 01:03:02 2018

CHROMIUM: kernel config: Renormalize to include IWL7000_TESTMODE

This is done after removing the dependence from NL80211_TESTMODE

BUG= chromium:807315 
TEST=VErify iwlxvt gets built and can be loaded on Soraka
Signed-off-by: Rajat Jain <rajatja@google.com>

Change-Id: Iafc23b1c2810585bc13e70f32159b0b63c9e704d
Reviewed-on: https://chromium-review.googlesource.com/967375
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
(cherry picked from commit 3e9cc1aa0b19cd8ee2b3d142fbabc97d605ee705)
Reviewed-on: https://chromium-review.googlesource.com/972787
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>

[modify] https://crrev.com/0dda4e8c2b6362011de001d0aff05e91f8aa4c72/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

Project Member

Comment 72 by bugdroid1@chromium.org, Mar 24 2018

Labels: merge-merged-release-R66-10452.B-chromeos-3.14
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ab4237d04a15e3a44d3c675bdc6081681bbb9f90

commit ab4237d04a15e3a44d3c675bdc6081681bbb9f90
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 02:52:50 2018

CHROMIUM: config: renormalize kernel configs

Use the following command:
./chromeos/scripts/kernelconfig oldconfig

And choose default options for all

BUG= chromium:807315 
TEST=Build

Change-Id: I37ffee117b9e047d73fb39f6f48c9396fd7bf541
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/977573
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/ab4237d04a15e3a44d3c675bdc6081681bbb9f90/chromeos/config/x86_64/common.config
[modify] https://crrev.com/ab4237d04a15e3a44d3c675bdc6081681bbb9f90/chromeos/config/i386/common.config
[modify] https://crrev.com/ab4237d04a15e3a44d3c675bdc6081681bbb9f90/chromeos/config/base.config

Project Member

Comment 73 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/0000ab038b28c1160705ee3ed668b4e7fffbd928

commit 0000ab038b28c1160705ee3ed668b4e7fffbd928
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 02:53:06 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

Signed-off-by: Rajat Jain <rajatja@google.com>
CQ-DEPEND=CL:967441
BUG= chromium:807315 
TEST=Tested for wifi on a Samus

Reviewed-on: https://chromium-review.googlesource.com/967382
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit 5f25edd9bd45385dae504992925670036478ba11)

Change-Id: I4ac61f37ff86e17fe4c6e6f54bfb6313acc6272a
Reviewed-on: https://chromium-review.googlesource.com/977574
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/0000ab038b28c1160705ee3ed668b4e7fffbd928/drivers/net/wireless/iwl7000/Kconfig
[modify] https://crrev.com/0000ab038b28c1160705ee3ed668b4e7fffbd928/drivers/net/wireless-3.8/iwl7000/Kconfig

Project Member

Comment 74 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ae341b2d1bc0344ef151cf56be05d5ee3e508280

commit ae341b2d1bc0344ef151cf56be05d5ee3e508280
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 02:53:16 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

BUG= chromium:807315 
TEST=Verified iwlxvk.ko loading on a samus
Signed-off-by: Rajat Jain <rajatja@google.com>

Reviewed-on: https://chromium-review.googlesource.com/967383
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit b00e05df5db97ba870c676d0f268afabbd046586)

Change-Id: I5c963db24744b9885cc75c7d3386c32b3e791f5b
Reviewed-on: https://chromium-review.googlesource.com/977575
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/ae341b2d1bc0344ef151cf56be05d5ee3e508280/drivers/net/wireless/iwl7000/Kconfig
[modify] https://crrev.com/ae341b2d1bc0344ef151cf56be05d5ee3e508280/drivers/net/wireless-3.8/iwl7000/Kconfig

Project Member

Comment 75 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/220a9e6a6641ec7a338d3359f38accc65c73cb20

commit 220a9e6a6641ec7a338d3359f38accc65c73cb20
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 02:53:17 2018

CHROMIUM: config: renormalize after iwl7000 Kconfig changes

./chromeos/scripts/kernelconfig oldconfig
(Choose default options - Deletes iwl7000 from all configs)

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested for wifi on a Samus

Change-Id: I7dcd7773fea0c704035997042e4fd004419282c1
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/977576
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/220a9e6a6641ec7a338d3359f38accc65c73cb20/chromeos/config/x86_64/common.config
[modify] https://crrev.com/220a9e6a6641ec7a338d3359f38accc65c73cb20/chromeos/config/i386/common.config
[modify] https://crrev.com/220a9e6a6641ec7a338d3359f38accc65c73cb20/chromeos/config/armel/chromiumos-ipq806x.flavour.config
[modify] https://crrev.com/220a9e6a6641ec7a338d3359f38accc65c73cb20/chromeos/config/mips/chromiumos-mipsel.flavour.config

Project Member

Comment 76 by bugdroid1@chromium.org, Mar 24 2018

Labels: merge-merged-release-R66-10452.B
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/board-overlays/+/26ee59025d7562f0682c013bfe2530eebee6db9b

commit 26ee59025d7562f0682c013bfe2530eebee6db9b
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Sat Mar 24 02:56:33 2018

tricky: Add use flag to use Intel wireless stack.

The Intel wireless module pulls along with it a variant of cfg80211,
which conflicts with stock cfg80211.
Use the "intelwifi38" use flag to enable CONFIG_IWL7000 and disable
stock CFG80211 module.

CQ-DEPEND=CL:969201
BUG= chromium:807315 
TEST=Build and run tryjobs on tricky, mccloud and falco_li (CL:*591061)
     Check that wifi works like before on each.

Change-Id: I0431ba848919d088be480bb91a561a9db219550d
Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/969301
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
(cherry picked from commit 7b0b9b7360b2ed6ccbfd140cc37e99963fe21309)
Reviewed-on: https://chromium-review.googlesource.com/978564
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/26ee59025d7562f0682c013bfe2530eebee6db9b/overlay-tricky/profiles/base/make.defaults

Project Member

Comment 77 by bugdroid1@chromium.org, Mar 24 2018

Labels: merge-merged-release-R66-10452.B
The following revision refers to this bug:
  https://chrome-internal.googlesource.com/chromeos/overlays/overlay-variant-falco-li-private/+/0215168887ec43d51bf194d2675a351bb2bf4675

commit 0215168887ec43d51bf194d2675a351bb2bf4675
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Sat Mar 24 02:56:33 2018

Project Member

Comment 78 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e

commit 8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 02:56:34 2018

CHROMIUM: configs: Drop CFG80211 from pineview and IWL7000 from others

This was generated like this:

echo CONFIG_CFG80211=n >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

echo CONFIG_IWL7000=m >>
chromeos/config/x86_64/chromeos-intel-pineview.flavour.config

./chromeos/scripts/kernelconfig oldconfig
(And select default configurations for everything)

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=Tested wifi on a samus

Reviewed-on: https://chromium-review.googlesource.com/967441
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit 22ea482a0c21c8bf43a4a5c9cbad8f040d5f0eea)

Change-Id: Ibfe2f3ca2ad830d42c7b8b5c4d48a0baf4e397c1
Reviewed-on: https://chromium-review.googlesource.com/977577
Reviewed-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e/chromeos/config/mips/common.config
[modify] https://crrev.com/8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e/chromeos/config/i386/common.config
[modify] https://crrev.com/8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
[modify] https://crrev.com/8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e/chromeos/config/armel/common.config
[modify] https://crrev.com/8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e/chromeos/config/arm64/common.config
[modify] https://crrev.com/8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e/chromeos/config/base.config
[modify] https://crrev.com/8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/8a78a208f2e7aac1dc722b89e870d0d1ed1e8a8e/chromeos/config/x86_64/common.config

Project Member

Comment 79 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/68a48fc1bad438d40ad2b967af65cc15b2c8d5f6

commit 68a48fc1bad438d40ad2b967af65cc15b2c8d5f6
Author: Kirtika Ruchandani <kirtika@google.com>
Date: Sat Mar 24 03:00:07 2018

cros-kernel2: Add config fragment to use Intel wifi stack

The Intel wireless module pulls along with it a variant of cfg80211,
which conflicts with stock cfg80211. Add a config fragment to enable
Intel wifi and disable stock cfg80211. Boards with Intel wifi can then
use the USE flag "intelwifi38" to make this config change.

CQ-DEPEND=CL:968023
BUG= chromium:807315 
TEST=Build and run tryjobs on tricky, mccloud and falco_li (CL:*59061)
     Check that wifi works like before on each.
     Build and run tryjobs on panther and stumpy.

Change-Id: I7fc026f92eb01c526f1eec5914130aa5cd7cd97a
Reviewed-on: https://chromium-review.googlesource.com/969201
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit 304d44c08264e3764256dc78cdc8d6dc3f406dd8)
Reviewed-on: https://chromium-review.googlesource.com/978585
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/68a48fc1bad438d40ad2b967af65cc15b2c8d5f6/eclass/cros-kernel2.eclass

Project Member

Comment 80 by bugdroid1@chromium.org, Mar 24 2018

Labels: merge-merged-release-R66-10452.B-chromeos-3.8
The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ccd076d055b6da0382282c95584f604eefb67d59

commit ccd076d055b6da0382282c95584f604eefb67d59
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 03:00:18 2018

CHROMIUM: iwl7000: Fix so as to not depend on cfg80211

Currently, the iwl7000 has a false dependency on standard cfg80211.
Fix the Kconfig so as to not depend on the generic cfg80211, actually
ensure they cannot be built in the same image.

Signed-off-by: Rajat Jain <rajatja@google.com>
CQ-DEPEND=CL:978564, CL:978585, CL:*594203
BUG= chromium:807315 
TEST=trybot on falco_li

Change-Id: Ia95a48133df80956a9e93e996b640a1e2b4f62c6
Reviewed-on: https://chromium-review.googlesource.com/966989
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit 7e49272bda250ec364cf279829e19b7584696a43)
(cherry picked from commit f293c33c332b15974c5e03043ad4ebb439d596f7)
Reviewed-on: https://chromium-review.googlesource.com/977568
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/ccd076d055b6da0382282c95584f604eefb67d59/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 81 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/f4a83492cc8fa50dff3a0acd4611f055d52fddee

commit f4a83492cc8fa50dff3a0acd4611f055d52fddee
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 03:00:20 2018

CHROMIUM: iwl7000: Fix so as to not depend on NL80211_TESTMODE

If we don't do this, IWL7000_TESTMODE is not selected because
NL80211_TESTMODE depends on CFG80211 which is disabled, and we
get depmod errors at the time of deploying.

BUG= chromium:807315 
TEST=trybot on falco_li
Signed-off-by: Rajat Jain <rajatja@google.com>

Change-Id: Ibb15d5f3cf5237d27a8b54178d6d77b9de0db715
Reviewed-on: https://chromium-review.googlesource.com/978837
Reviewed-by: Brian Norris <briannorris@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/f4a83492cc8fa50dff3a0acd4611f055d52fddee/drivers/net/wireless/iwl7000/Kconfig

Project Member

Comment 82 by bugdroid1@chromium.org, Mar 24 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ade2c360c745663cc65a2c48ac95bfb619708454

commit ade2c360c745663cc65a2c48ac95bfb619708454
Author: Rajat Jain <rajatja@google.com>
Date: Sat Mar 24 03:00:22 2018

CHROMIUM: Renormalize after iwl7000 Kconfig changes

./chromeos/scripts/kernelconfig olddefconfig
(disables CONFIG_IWL7000 for all, due to Kconfig changes
in previous CL)

I'm not sure why DEV_COREDUMP CONFIG is removed by splitconfig
but Kirtika tells me that the only users are BT SDIO and wireless-4.2
none of whom are x86.

Signed-off-by: Rajat Jain <rajatja@google.com>
BUG= chromium:807315 
TEST=trybot on falco_li

Change-Id: Ibb377d5c119a0605bb15db46e0c9f457c0502d78
Reviewed-on: https://chromium-review.googlesource.com/967016
Commit-Ready: Rajat Jain <rajatja@chromium.org>
Tested-by: Rajat Jain <rajatja@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
(cherry picked from commit ba3bfe039dfedf2e25f353c5e037dc3678315fea)
Reviewed-on: https://chromium-review.googlesource.com/977570
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>

[modify] https://crrev.com/ade2c360c745663cc65a2c48ac95bfb619708454/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
[modify] https://crrev.com/ade2c360c745663cc65a2c48ac95bfb619708454/chromeos/config/i386/common.config
[modify] https://crrev.com/ade2c360c745663cc65a2c48ac95bfb619708454/chromeos/config/x86_64/chromiumos-x86_64.flavour.config

Labels: -Merge-Review-66
are there any pending merges here?

otherwise please mark as fixed to get it verified in ToT/m66

Comment 84 by rajatja@google.com, Mar 26 2018

Status: Fixed (was: Started)
Status: Verified (was: Fixed)
Bulk verify old fixed bugs...

Sign in to add a comment