Skip to content

Commit a43e618

Browse files
jmberg-inteljmberg-intel
committed
Merge remote-tracking branch 'net-next/master' into mac80211-next
This brings in commit 7a7c0a6 ("mac80211: fix TX aggregation start/stop callback race") to allow the follow-up cleanup. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2 parents 5d473fe + 50dffe7 commit a43e618

File tree

1,509 files changed

+43581
-20388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,509 files changed

+43581
-20388
lines changed

‎Documentation/ABI/testing/sysfs-class-net

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,3 +251,11 @@ Contact: netdev@vger.kernel.org
251251
Description:
252252
Indicates the unique physical switch identifier of a switch this
253253
port belongs to, as a string.
254+
255+
What: /sys/class/net/<iface>/phydev
256+
Date: May 2017
257+
KernelVersion: 4.13
258+
Contact: netdev@vger.kernel.org
259+
Description:
260+
Symbolic link to the PHY device this network device is attached
261+
to.

‎Documentation/ABI/testing/sysfs-class-net-phydev

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
What: /sys/class/mdio_bus/<bus>/<device>/attached_dev
2+
Date: May 2017
3+
KernelVersion: 4.13
4+
Contact: netdev@vger.kernel.org
5+
Description:
6+
Symbolic link to the network device this PHY device is
7+
attached to.
8+
9+
What: /sys/class/mdio_bus/<bus>/<device>/phy_has_fixups
10+
Date: February 2014
11+
KernelVersion: 3.15
12+
Contact: netdev@vger.kernel.org
13+
Description:
14+
Boolean value indicating whether the PHY device has
15+
any fixups registered against it (phy_register_fixup)
16+
17+
What: /sys/class/mdio_bus/<bus>/<device>/phy_id
18+
Date: November 2012
19+
KernelVersion: 3.8
20+
Contact: netdev@vger.kernel.org
21+
Description:
22+
32-bit hexadecimal value corresponding to the PHY device's OUI,
23+
model and revision number.
24+
25+
What: /sys/class/mdio_bus/<bus>/<device>/phy_interface
26+
Date: February 2014
27+
KernelVersion: 3.15
28+
Contact: netdev@vger.kernel.org
29+
Description:
30+
String value indicating the PHY interface, possible
31+
values are:.
32+
<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,
33+
rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii
34+
xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,
35+
xaui, 10gbase-kr, unknown
36+

‎Documentation/acpi/acpi-lid.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,28 @@ button driver uses the following 3 modes in order not to trigger issues.
5959
If the userspace hasn't been prepared to ignore the unreliable "opened"
6060
events and the unreliable initial state notification, Linux users can use
6161
the following kernel parameters to handle the possible issues:
62-
A. button.lid_init_state=open:
62+
A. button.lid_init_state=method:
63+
When this option is specified, the ACPI button driver reports the
64+
initial lid state using the returning value of the _LID control method
65+
and whether the "opened"/"closed" events are paired fully relies on the
66+
firmware implementation.
67+
This option can be used to fix some platforms where the returning value
68+
of the _LID control method is reliable but the initial lid state
69+
notification is missing.
70+
This option is the default behavior during the period the userspace
71+
isn't ready to handle the buggy AML tables.
72+
B. button.lid_init_state=open:
6373
When this option is specified, the ACPI button driver always reports the
6474
initial lid state as "opened" and whether the "opened"/"closed" events
6575
are paired fully relies on the firmware implementation.
6676
This may fix some platforms where the returning value of the _LID
6777
control method is not reliable and the initial lid state notification is
6878
missing.
69-
This option is the default behavior during the period the userspace
70-
isn't ready to handle the buggy AML tables.
7179

7280
If the userspace has been prepared to ignore the unreliable "opened" events
7381
and the unreliable initial state notification, Linux users should always
7482
use the following kernel parameter:
75-
B. button.lid_init_state=ignore:
83+
C. button.lid_init_state=ignore:
7684
When this option is specified, the ACPI button driver never reports the
7785
initial lid state and there is a compensation mechanism implemented to
7886
ensure that the reliable "closed" notifications can always be delievered

‎Documentation/admin-guide/pm/cpufreq.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.. |struct cpufreq_policy| replace:: :c:type:`struct cpufreq_policy <cpufreq_policy>`
2+
.. |intel_pstate| replace:: :doc:`intel_pstate <intel_pstate>`
23

34
=======================
45
CPU Performance Scaling
@@ -75,7 +76,7 @@ feedback registers, as that information is typically specific to the hardware
7576
interface it comes from and may not be easily represented in an abstract,
7677
platform-independent way. For this reason, ``CPUFreq`` allows scaling drivers
7778
to bypass the governor layer and implement their own performance scaling
78-
algorithms. That is done by the ``intel_pstate`` scaling driver.
79+
algorithms. That is done by the |intel_pstate| scaling driver.
7980

8081

8182
``CPUFreq`` Policy Objects
@@ -174,13 +175,13 @@ necessary to restart the scaling governor so that it can take the new online CPU
174175
into account. That is achieved by invoking the governor's ``->stop`` and
175176
``->start()`` callbacks, in this order, for the entire policy.
176177

177-
As mentioned before, the ``intel_pstate`` scaling driver bypasses the scaling
178+
As mentioned before, the |intel_pstate| scaling driver bypasses the scaling
178179
governor layer of ``CPUFreq`` and provides its own P-state selection algorithms.
179-
Consequently, if ``intel_pstate`` is used, scaling governors are not attached to
180+
Consequently, if |intel_pstate| is used, scaling governors are not attached to
180181
new policy objects. Instead, the driver's ``->setpolicy()`` callback is invoked
181182
to register per-CPU utilization update callbacks for each policy. These
182183
callbacks are invoked by the CPU scheduler in the same way as for scaling
183-
governors, but in the ``intel_pstate`` case they both determine the P-state to
184+
governors, but in the |intel_pstate| case they both determine the P-state to
184185
use and change the hardware configuration accordingly in one go from scheduler
185186
context.
186187

@@ -257,7 +258,7 @@ are the following:
257258

258259
``scaling_available_governors``
259260
List of ``CPUFreq`` scaling governors present in the kernel that can
260-
be attached to this policy or (if the ``intel_pstate`` scaling driver is
261+
be attached to this policy or (if the |intel_pstate| scaling driver is
261262
in use) list of scaling algorithms provided by the driver that can be
262263
applied to this policy.
263264

@@ -274,7 +275,7 @@ are the following:
274275
the CPU is actually running at (due to hardware design and other
275276
limitations).
276277

277-
Some scaling drivers (e.g. ``intel_pstate``) attempt to provide
278+
Some scaling drivers (e.g. |intel_pstate|) attempt to provide
278279
information more precisely reflecting the current CPU frequency through
279280
this attribute, but that still may not be the exact current CPU
280281
frequency as seen by the hardware at the moment.
@@ -284,13 +285,13 @@ are the following:
284285

285286
``scaling_governor``
286287
The scaling governor currently attached to this policy or (if the
287-
``intel_pstate`` scaling driver is in use) the scaling algorithm
288+
|intel_pstate| scaling driver is in use) the scaling algorithm
288289
provided by the driver that is currently applied to this policy.
289290

290291
This attribute is read-write and writing to it will cause a new scaling
291292
governor to be attached to this policy or a new scaling algorithm
292293
provided by the scaling driver to be applied to it (in the
293-
``intel_pstate`` case), as indicated by the string written to this
294+
|intel_pstate| case), as indicated by the string written to this
294295
attribute (which must be one of the names listed by the
295296
``scaling_available_governors`` attribute described above).
296297

@@ -619,7 +620,7 @@ This file is located under :file:`/sys/devices/system/cpu/cpufreq/` and controls
619620
the "boost" setting for the whole system. It is not present if the underlying
620621
scaling driver does not support the frequency boost mechanism (or supports it,
621622
but provides a driver-specific interface for controlling it, like
622-
``intel_pstate``).
623+
|intel_pstate|).
623624

624625
If the value in this file is 1, the frequency boost mechanism is enabled. This
625626
means that either the hardware can be put into states in which it is able to

‎Documentation/admin-guide/pm/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Power Management
66
:maxdepth: 2
77

88
cpufreq
9+
intel_pstate
910

1011
.. only:: subproject and html
1112

0 commit comments

Comments
 (0)