Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a43e6184 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'net-next/master' into mac80211-next 



This brings in commit 7a7c0a64 ("mac80211: fix TX aggregation
start/stop callback race") to allow the follow-up cleanup.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 5d473fed 50dffe7f

Documentation/ABI/testing/sysfs-class-net

+8 −0
Original line number Diff line number Diff line
@@ -251,3 +251,11 @@ Contact: netdev@vger.kernel.org 
Description:

		Indicates the unique physical switch identifier of a switch this

		port belongs to, as a string.



What:		/sys/class/net/<iface>/phydev

Date:		May 2017

KernelVersion:	4.13

Contact:	netdev@vger.kernel.org

Description:

		Symbolic link to the PHY device this network device is attached

		to.

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

0 → 100644
+36 −0
Original line number Diff line number Diff line 
What:		/sys/class/mdio_bus/<bus>/<device>/attached_dev

Date:		May 2017

KernelVersion:	4.13

Contact:	netdev@vger.kernel.org

Description:

		Symbolic link to the network device this PHY device is

		attached to.



What:		/sys/class/mdio_bus/<bus>/<device>/phy_has_fixups

Date:		February 2014

KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		Boolean value indicating whether the PHY device has

		any fixups registered against it (phy_register_fixup)



What:		/sys/class/mdio_bus/<bus>/<device>/phy_id

Date:		November 2012

KernelVersion:	3.8

Contact:	netdev@vger.kernel.org

Description:

		32-bit hexadecimal value corresponding to the PHY device's OUI,

		model and revision number.



What:		/sys/class/mdio_bus/<bus>/<device>/phy_interface

Date:		February 2014

KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		String value indicating the PHY interface, possible

		values are:.

		<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,

		rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii

		xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,

		xaui, 10gbase-kr, unknown

Documentation/acpi/acpi-lid.txt

+12 −4
Original line number Diff line number Diff line
@@ -59,20 +59,28 @@ button driver uses the following 3 modes in order not to trigger issues. 
If the userspace hasn't been prepared to ignore the unreliable "opened"

events and the unreliable initial state notification, Linux users can use

the following kernel parameters to handle the possible issues:

A. button.lid_init_state=open:

A. button.lid_init_state=method:

   When this option is specified, the ACPI button driver reports the

   initial lid state using the returning value of the _LID control method

   and whether the "opened"/"closed" events are paired fully relies on the

   firmware implementation.

   This option can be used to fix some platforms where the returning value

   of the _LID control method is reliable but the initial lid state

   notification is missing.

   This option is the default behavior during the period the userspace

   isn't ready to handle the buggy AML tables.

B. button.lid_init_state=open:

   When this option is specified, the ACPI button driver always reports the

   initial lid state as "opened" and whether the "opened"/"closed" events

   are paired fully relies on the firmware implementation.

   This may fix some platforms where the returning value of the _LID

   control method is not reliable and the initial lid state notification is

   missing.

   This option is the default behavior during the period the userspace

   isn't ready to handle the buggy AML tables.



If the userspace has been prepared to ignore the unreliable "opened" events

and the unreliable initial state notification, Linux users should always

use the following kernel parameter:

B. button.lid_init_state=ignore:

C. button.lid_init_state=ignore:

   When this option is specified, the ACPI button driver never reports the

   initial lid state and there is a compensation mechanism implemented to

   ensure that the reliable "closed" notifications can always be delievered

Documentation/admin-guide/pm/cpufreq.rst

+10 −9
Original line number Diff line number Diff line 
.. |struct cpufreq_policy| replace:: :c:type:`struct cpufreq_policy <cpufreq_policy>`

.. |intel_pstate| replace:: :doc:`intel_pstate <intel_pstate>`



=======================

CPU Performance Scaling
@@ -75,7 +76,7 @@ feedback registers, as that information is typically specific to the hardware 
interface it comes from and may not be easily represented in an abstract,

platform-independent way.  For this reason, ``CPUFreq`` allows scaling drivers

to bypass the governor layer and implement their own performance scaling

algorithms.  That is done by the ``intel_pstate`` scaling driver.

algorithms.  That is done by the |intel_pstate| scaling driver.





``CPUFreq`` Policy Objects
@@ -174,13 +175,13 @@ necessary to restart the scaling governor so that it can take the new online CPU 
into account.  That is achieved by invoking the governor's ``->stop`` and

``->start()`` callbacks, in this order, for the entire policy.



As mentioned before, the ``intel_pstate`` scaling driver bypasses the scaling

As mentioned before, the |intel_pstate| scaling driver bypasses the scaling

governor layer of ``CPUFreq`` and provides its own P-state selection algorithms.

Consequently, if ``intel_pstate`` is used, scaling governors are not attached to

Consequently, if |intel_pstate| is used, scaling governors are not attached to

new policy objects.  Instead, the driver's ``->setpolicy()`` callback is invoked

to register per-CPU utilization update callbacks for each policy.  These

callbacks are invoked by the CPU scheduler in the same way as for scaling

governors, but in the ``intel_pstate`` case they both determine the P-state to

governors, but in the |intel_pstate| case they both determine the P-state to

use and change the hardware configuration accordingly in one go from scheduler

context.
@@ -257,7 +258,7 @@ are the following: 


``scaling_available_governors``

	List of ``CPUFreq`` scaling governors present in the kernel that can

	be attached to this policy or (if the ``intel_pstate`` scaling driver is

	be attached to this policy or (if the |intel_pstate| scaling driver is

	in use) list of scaling algorithms provided by the driver that can be

	applied to this policy.
@@ -274,7 +275,7 @@ are the following: 
	the CPU is actually running at (due to hardware design and other

	limitations).



	Some scaling drivers (e.g. ``intel_pstate``) attempt to provide

	Some scaling drivers (e.g. |intel_pstate|) attempt to provide

	information more precisely reflecting the current CPU frequency through

	this attribute, but that still may not be the exact current CPU

	frequency as seen by the hardware at the moment.
@@ -284,13 +285,13 @@ are the following: 


``scaling_governor``

	The scaling governor currently attached to this policy or (if the

	``intel_pstate`` scaling driver is in use) the scaling algorithm

	|intel_pstate| scaling driver is in use) the scaling algorithm

	provided by the driver that is currently applied to this policy.



	This attribute is read-write and writing to it will cause a new scaling

	governor to be attached to this policy or a new scaling algorithm

	provided by the scaling driver to be applied to it (in the

	``intel_pstate`` case), as indicated by the string written to this

	|intel_pstate| case), as indicated by the string written to this

	attribute (which must be one of the names listed by the

	``scaling_available_governors`` attribute described above).
@@ -619,7 +620,7 @@ This file is located under :file:`/sys/devices/system/cpu/cpufreq/` and controls 
the "boost" setting for the whole system.  It is not present if the underlying

scaling driver does not support the frequency boost mechanism (or supports it,

but provides a driver-specific interface for controlling it, like

``intel_pstate``).

|intel_pstate|).



If the value in this file is 1, the frequency boost mechanism is enabled.  This

means that either the hardware can be put into states in which it is able to

Documentation/admin-guide/pm/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Power Management 
   :maxdepth: 2



   cpufreq

   intel_pstate



.. only::  subproject and html