Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: beagleboard/linux
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.14
Choose a base ref
...
head repository: lorforlinux/beagleboard-linux
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.14
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on May 15, 2020

  1. merge: aufs-kbuild

    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    7388739 View commit details
  2. merge: aufs-base

    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    a9ba7c6 View commit details
  3. merge: aufs-mmap

    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    e945722 View commit details
  4. merge: aufs-standalone

    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    c45722d View commit details
  5. merge: aufs

    sfjro/aufs4-standalone@df5c09a
    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    001669d View commit details
  6. merge: can-isotp: https://github.com/hartkopp/can-isotp

    hartkopp/can-isotp@ced84ca
    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    ca645f3 View commit details
  7. CAN_ISOTP: wire up to kconfig/makefile

    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    13f2ef4 View commit details
  8. Revert "nohz: Fix missing tick reprogram when interrupting an inline …

    …softirq"
    
    This reverts commit 2d89891.
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    d806936 View commit details
  9. merge: WireGuard

    https://git.zx2c4.com/WireGuard/commit/edad0d6e99e5133b1e8e865d727a25fff6399cb4
    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    6a56894 View commit details
  10. Copy the full SHA
    c8b89ac View commit details
  11. Copy the full SHA
    f22ff03 View commit details
  12. backports: stmpe: from: linux.git

    Reference: v5.3.18
    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    8db7cc0 View commit details
  13. stmpe: wire up adc Kconfig/Makefile

    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    5927041 View commit details
  14. stmpe-ts: add invert/swap options

    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    1549e52 View commit details
  15. stmpe-ts.c: add offsets

    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    7705bbe View commit details
  16. backports: vl53l0x: from: linux.git

    Reference: v5.0.21
    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    57f41ae View commit details
  17. wire up VL53L0X_I2C

    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    b686f2d View commit details
  18. backports: brcm80211: from: linux.git

    Reference: v4.14.77
    Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
    RobertCNelson committed May 15, 2020
    Copy the full SHA
    12309d5 View commit details
  19. brcmfmac: add CLM download support

    The firmware for brcmfmac devices includes information regarding
    regulatory constraints. For certain devices this information is kept
    separately in a binary form that needs to be downloaded to the device.
    This patch adds support to download this so-called CLM blob file. It
    uses the same naming scheme as the other firmware files with extension
    of .clm_blob.
    
    The CLM blob file is optional. If the file does not exist, the download
    process will be bypassed. It will not affect the driver loading.
    
    Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
    Signed-off-by: Chung-Hsien Hsu <stanley.hsu@cypress.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Chung-Hsien Hsu authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    2f30c3c View commit details
  20. brcmfmac: Set F2 blksz and Watermark to 256 for 4373

    We got SDIO_CRC_ERROR with 4373 on SDR104 when doing bi-directional
    throughput test. Setting F2 blocksize and enable watermark to 256 to
    guarantee the operation stability.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    9c13464 View commit details
  21. brcmfmac: Add sg parameters dts parsing

    broken_sg_support, sd_head_align, and sd_sgentry_align are used in
    brcmfmac code but not configurable in dts file. Add the parsing logic.
    Now they can be configured like below in dts:
    	brcm,broken_sg_support;
    	brcm,sd_head_align = /bits/ 16 <4>;
    	brcm,sd_sgentry_align = /bits/ 16 <4>;
    
    Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
    cy-chihsien authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    496f352 View commit details
  22. brcmfmac: return -EPERM when getting error in vendor command handler

    Firmware returns proprietary error code when getting error in
    fil_cmd_data_set or fil_cmd_data_get. Sometimes the vendor tool or
    utilities which uses libnl may stuck in some commands when wl is down.
    For example, issue "scan" command after issuing "down" command, the
    "scan" command will be the blocking call and stuck as no response from
    firmware. It is caused by that firmware returns BCME_NOTUP(-4) when wl
    is down, but in Linux the -4 is -EINTR, so libnl catches the error and
    not pass to upper layer.
    Because of that, the driver should return Linux error code instead of the
    proprietary error code, and the tools or utilities need to get the real
    firmware error code by another command "bcmerrorstr" after receiving
    the error.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    f2ad9a6 View commit details
  23. brcmfmac: Add support for CYW43012 SDIO chipset

    CYW43012 is a 1x1 802.11a/b/g/n Dual-Band HT20, 256-QAM/Turbo QAM. It
    is an Ultra Low Power WLAN+BT combo chip.
    
    Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
    cy-chihsien authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    9581521 View commit details
  24. brcmfmac: set apsta to 0 when AP starts on primary interface

    APSTA can work on two band concurrently with using VSDB(Virtual
    Simultaneous Dual-Band) or RSDB(Real Simultaneous Dual-Band) features.
    In this case, we have to keep apsta is 1 in firmware side.
    If we start wpa_supplicant on wlan0 and then start hostapd on wlan1, the
    apsta will be set to 0, and data will be stall on wlan0(station).
    Because that, we only set apsta to 0 when AP start on primary interface.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    1828fac View commit details
  25. brcmfmac: Saverestore support changes for 43012

    Saverestore register settings for 43012.
    
    Signed-off-by: Praveen Babu Chandran <pucn@cypress.com>
    praveenCY authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    70adfd4 View commit details
  26. brcmfmac: Support 43455 save-restore (SR) feature if FW include -sr

    This patch will add 43455 into the save-restore(SR) capable chip list, so
    the SR engine will be enabled with 43455 FW which built-in the -sr
    function.
    
    Signed-off-by: Lo-Hsiang Lo <double.lo@cypress.com>
    Double Lo authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    20483ac View commit details
  27. brcmfmac: fix CLM load error for legacy chips when user helper is ena…

    …bled
    
    For legacy chips w/o CLM blob files, kernel with user helper function
    enabled returns -EAGAIN when we request_firmware() for blob file:
    "request_firmware() -> _request_firmware() -> fw_load_from_user_helper()
    -> _request_firmware_load() -> retval=-EAGAIN"
    We should do retries and also continue brcmf_c_process_clm_blob if
    getting -EAGAIN from request_firmware function.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    8f0df8b View commit details
  28. brcmfmac: enlarge buffer size of caps to 512 bytes

    The buffer size of return of cap iovar is greater than 256 bytes in
    some firmares. For instance, the return size of cap iovar is 271 bytes
    in 4373 13.10.246.79 firmare. It makes caps buffer is default value and
    cause the feature capability parsing failed.
    Because of that, we enlarge caps buffer size to 512 bytes and add
    the error print for cap iovar error.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    edb3a5a View commit details
  29. brcmfmac: calling skb_orphan before sending skb to SDIO bus

    Linux 3.6 introduces TSQ which has a per socket threshold for TCP Tx
    packet to reduce latency. In fcmode 1/2, host driver enqueues skb in
    hanger and TCP doesn't push new skb frees until host frees the skb when
    receiving fwstatus event. So using skb_orphan before sending skb to bus
    will make the skb removing the ownership of socket. With this patch, we
    got better throughput in fcmode 1/2.
    
    Tested 43455 TCP throughput in 20 MHz bandwidth with/without this patch.
    fcmode 0: 59.5 / 59.6 (Mbps)
    fcmode 1: 59.3 / 23.4 (Mbps)
    fcmode 2: 59.6 / 21.5 (Mbps)
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    eb4d73a View commit details
  30. brcmfmac: 43012 Update F2 Watermark to 0x60 to fix DMA Error during U…

    …DP RX Traffic.
    
    The number of words that the read FIFO has to contain except
    the end of frame before sends data back to the host.
    Max watermark = (512B - 2* (BurstLength))/4 =
    (512 - 128)/4 = 384/4 = 0x60
    so if burst length (i.e. BurstLength = 64) is increased,
    watermark has to be reduced. This is the optimal setting for this chip.
    
    Signed-off-by: Naveen Gupta <nagu@cypress.com>
    Naveen authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    6334880 View commit details
  31. brcmfmac: DS1 Exit should re download the firmware.

    In Deep Sleep mode ARM is off and once Exit trigger comes than
    Mail Box Interrupt comes to Host and whole Re Initiation should be done
    in the ARM to start TX/RX.
    
    Signed-off-by: Naveen Gupta <nagu@cypress.com>
    Naveen authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    e25a088 View commit details
  32. brcmfmac: add FT-based AKMs in brcmf_set_key_mgmt() for FT support

    Add WLAN_AKM_SUITE_FT_8021X and WLAN_AKM_SUITE_FT_PSK in
    brcmf_set_key_mgmt() for FT support.
    
    Signed-off-by: Chung-Hsien Hsu <stanley.hsu@cypress.com>
    Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
    Chung-Hsien Hsu authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    760eebf View commit details
  33. brcmfmac: support AP isolation

    Hostap daemon has a parameter "ap_isolate which is used to prevent
    low-level bridging of frames between associated stations in the BSS.
    For driver side, we add cfg80211 ops method change_bss to support
    setting AP isolation from user space.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    3800731 View commit details
  34. brcmfmac: do not print ulp_sdioctrl get error

    Don't print ulp_sdioctrl get error as errors are expected for non ulp cases.
    
    Signed-off-by: Naveen Gupta <nagu@cypress.com>
    Naveen authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    fd3ec58 View commit details
  35. brcmfmac: fix system warning message during wowl suspend

    There is a system warning message, warn_slowpath-fmt, during suspend
    while using supplicant join AP and enable wowl feature by IW command.
    It's cuased by brcmf_pno_remove_request path can't find the reqid.
    This fix will not go to remove pno request function if there is no
    pno scan.
    
    Signed-off-by: Lo-Hsiang Lo <double.lo@cypress.com>
    Double Lo authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    de28e22 View commit details
  36. brcmfmac: add a module parameter to set scheduling priority of sdio_dpc

    To enhance RX throughput, we add a module parameter "sdio_dpc_prio" to let
    user can set scheduling  priority for sdio_dpc. It can improve RX
    throughput by reducing the receiving time in sdio_dpc.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    e938d66 View commit details
  37. brcmfmac: make firmware eap_restrict a module parameter

    When eap_restrict is enabled, firmware will toss non-802.1x frames from
    tx/rx data path if station not yet authorized.
    Internal firmware eap_restrict is disabled by default. This patch makes
    it possible to enable firmware eap_restrict by specifying
    eap_restrict=1 as module parameter.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    8f0af93 View commit details
  38. brcmfmac: Support wake on ping packet

    FMAC driver need to provide a dummy wowlan filter for kernel and
    provided the well configured wowlan stack. So the system will
    keep driver in connected state in suspend mode and can be wake
    up by ping packet.
    
    Enable unicast packet filter before system suspend and
    disable it after resume.
    
    Signed-off-by: Lo-Hsiang Lo <double.lo@cypress.com>
    Double Lo authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    ccf0ddf View commit details
  39. brcmfmac: Remove WOWL configuration in disconnect state

    Set wowl configuration in disconnect state is redundant.
    Remove it to fix no scan result issue after resume.
    
    Signed-off-by: Lo-Hsiang Lo <double.lo@cypress.com>
    Double Lo authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    ea8ba1b View commit details
  40. brcmfmac: add CYW89342 PCIE device

    CYW89342 is a 2x2 MIMO,802.11a/b/g/n/ac,SDIO 3.0 and PCIe 3.0 for WLAN.
    It is an automotive wireless chip.
    
    Signed-off-by: Saint Chuang <saint.chuang@cypress.com>
    Saint Chuang authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    07c893a View commit details
  41. brcmfmac: handle compressed tx status signal

    Firmware inform the driver about tx status by normal tx status signal
    or compressed tx status signal. This patch adds support to handle the
    compressed tx status signal.
    
    Signed-off-by: Chung-Hsien Hsu <stanley.hsu@cypress.com>
    Chung-Hsien Hsu authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    536e9f2 View commit details
  42. revert: brcmfmac: add a module parameter to set scheduling priority o…

    …f sdio_dpc
    
    will use WQ_HIGHPRI instead.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    922663f View commit details
  43. brcmfmac: make setting SDIO workqueue WQ_HIGHPRI a module parameter

    With setting sdio_wq_highpri=1 in module parameters, tasks submitted to
    SDIO workqueue will put at the head of the queue and run immediately.
    This parameter is for getting higher TX/RX throughput with SDIO bus.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    226920e View commit details
  44. brcmfmac: add credit map updating support

    The credit numbers are static and tunable per chip in firmware side.
    However the credit number may be changed that is based on packet pool
    length and will send BRCMF_E_FIFO_CREDIT_MAP event to ask host driver
    updating the credit numbers during interface up.
    The purpose of this patch is making host driver has ability of updating
    the credit numbers when receiving the BRCMF_E_FIFO_CREDIT_MAP event.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    7de3bc9 View commit details
  45. brcmfmac: add 4-way handshake offload detection for FT-802.1X

    Add 4-way handshake offload detection for FT with EAP authentication.
    
    Signed-off-by: Chung-Hsien Hsu <stanley.hsu@cypress.com>
    Chung-Hsien Hsu authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    7f98556 View commit details
  46. brcmfmac: remove "arp_hostip_clear" from "brcmf_netdev_stop"

    The firmware does not respond ARP request and causes ping failed with
    following steps.
    
    1. Bring up inteface
       ifconfig wlan0 up or start wpa_supplicant
    2. Set the IP address
       ifconfig wlan0 192.168.100.10
    3. Bring down interface or
       ifconfig wlan0 down or kill wpa_supplicant
    4. Bring up inteface again and set the same IP address
    5. Connect to AP(192.168.100.1) and ping to AP will be failed.
    
    FMAC clears arp_hostip when bringing down the interface, but not set it
    back if setting the same IP address. We are able to see the IP address
    in interface info(inconfig wlan0) but the ping still cannot work because
    the firmware ARP offload does not respond the ARP request.
    Because of that, we remove "arp_hostip_clear" from function
    "brcmf_netdev_stop"
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    eeba4f6 View commit details
  47. brcmfmac: fix unused variable building warning message

    The variable "wq_flags" is not used anymore. Remove it.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    51ab42c View commit details
  48. brcmfmac: disable command decode in sdio_aos for 4339/4345

    Transaction between AOS and SDIOD is not protected, and if cmd 52
    received in AOS and in the middle of response state changed from AOS to
    SDIOD, response is corrupted and it causes to SDIO Host controller to
    hang.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    c91ded6 View commit details
  49. Revert "brcmfmac: fix CLM load error for legacy chips when user helpe…

    …r is enabled"
    
    This reverts commit b56e808f2e14c364ea907ce183be3ed7affb5b9c.
    
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    3aa9a86 View commit details
  50. brcmfmac: fix CLM load error for legacy chips when user helper is ena…

    …bled
    
    commit cc124d5 upstream.
    
    For legacy chips without CLM blob files, kernel with user helper function
    returns -EAGAIN when we request_firmware(), and then driver got failed
    when bringing up legacy chips. We expect the CLM blob file for legacy chip
    is not existence in firmware path, but the -ENOENT error is transferred to
    -EAGAIN in firmware_class.c with user helper.
    Because of that, we continue with CLM data currently present in firmware
    if getting error from doing request_firmware().
    
    Cc: stable@vger.kernel.org # v4.15.y
    Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
    Signed-off-by: Wright Feng <wright.feng@cypress.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    WenChieh-Feng authored and RobertCNelson committed May 15, 2020
    Copy the full SHA
    9892d6f View commit details
Showing 567 changed files with 129,987 additions and 1,949 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -124,3 +124,7 @@ all.config

# Kdevelop4
*.kdev4

# dtb objects
*.dtb
*.dtbo
55 changes: 55 additions & 0 deletions Documentation/ABI/testing/debugfs-aufs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
What: /debug/aufs/si_<id>/
Date: March 2009
Contact: J. R. Okajima <hooanon05g@gmail.com>
Description:
Under /debug/aufs, a directory named si_<id> is created
per aufs mount, where <id> is a unique id generated
internally.

What: /debug/aufs/si_<id>/plink
Date: Apr 2013
Contact: J. R. Okajima <hooanon05g@gmail.com>
Description:
It has three lines and shows the information about the
pseudo-link. The first line is a single number
representing a number of buckets. The second line is a
number of pseudo-links per buckets (separated by a
blank). The last line is a single number representing a
total number of psedo-links.
When the aufs mount option 'noplink' is specified, it
will show "1\n0\n0\n".

What: /debug/aufs/si_<id>/xib
Date: March 2009
Contact: J. R. Okajima <hooanon05g@gmail.com>
Description:
It shows the consumed blocks by xib (External Inode Number
Bitmap), its block size and file size.
When the aufs mount option 'noxino' is specified, it
will be empty. About XINO files, see the aufs manual.

What: /debug/aufs/si_<id>/xi0, xi1 ... xiN and xiN-N
Date: March 2009
Contact: J. R. Okajima <hooanon05g@gmail.com>
Description:
It shows the consumed blocks by xino (External Inode Number
Translation Table), its link count, block size and file
size.
Due to the file size limit, there may exist multiple
xino files per branch. In this case, "-N" is added to
the filename and it corresponds to the index of the
internal xino array. "-0" is omitted.
When the aufs mount option 'noxino' is specified, Those
entries won't exist. About XINO files, see the aufs
manual.

What: /debug/aufs/si_<id>/xigen
Date: March 2009
Contact: J. R. Okajima <hooanon05g@gmail.com>
Description:
It shows the consumed blocks by xigen (External Inode
Generation Table), its block size and file size.
If CONFIG_AUFS_EXPORT is disabled, this entry will not
be created.
When the aufs mount option 'noxino' is specified, it
will be empty. About XINO files, see the aufs manual.
31 changes: 31 additions & 0 deletions Documentation/ABI/testing/sysfs-aufs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
What: /sys/fs/aufs/si_<id>/
Date: March 2009
Contact: J. R. Okajima <hooanon05g@gmail.com>
Description:
Under /sys/fs/aufs, a directory named si_<id> is created
per aufs mount, where <id> is a unique id generated
internally.

What: /sys/fs/aufs/si_<id>/br0, br1 ... brN
Date: March 2009
Contact: J. R. Okajima <hooanon05g@gmail.com>
Description:
It shows the abolute path of a member directory (which
is called branch) in aufs, and its permission.

What: /sys/fs/aufs/si_<id>/brid0, brid1 ... bridN
Date: July 2013
Contact: J. R. Okajima <hooanon05g@gmail.com>
Description:
It shows the id of a member directory (which is called
branch) in aufs.

What: /sys/fs/aufs/si_<id>/xi_path
Date: March 2009
Contact: J. R. Okajima <hooanon05g@gmail.com>
Description:
It shows the abolute path of XINO (External Inode Number
Bitmap, Translation Table and Generation Table) file
even if it is the default path.
When the aufs mount option 'noxino' is specified, it
will be empty. About XINO files, see the aufs manual.
63 changes: 63 additions & 0 deletions Documentation/ABI/testing/sysfs-devices-platform-bone_capemgr
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
What: /sys/devices/platform/bone_capemgr/slots
Date: May 2015
KernelVersion: 4.0
Contact: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Description:
READ:
Describe the state of all the slots of the beaglebone capemgr.
Each line of the output describes a slot:
The slot format is as following:
<slot-id>: [P-][F-][O-][l-][L-][D-] \
<overlay-id> <board-name>,<version>,
<manufacturer>,<part-number>

Where the flags are:
P: Slot has been probed
F: Slot has failed probing (i.e. no EEPROM detected)
O: Slot has been overridden by the user
l: Slot is current loading
L: Slot has completed loading and is ready
D: Slot has been disabled

Example:
0: P---L- -1 BeagleBone RS232 CAPE,00A1,Beagleboardtoys,BB-BONE-SERL-03
1: PF---- -1
2: PF---- -1
3: PF---- -1

WRITE:
Writing a string of the form <part-number>[:version] issues a request to
load a firmware blob containing an overlay. The name of the firmware blob
is <part-number>-[version|00A0].dtbo. This act is defined as a slot override.

Writing a negative slot id removes the slot if it was an overridden one, or
unloads a slot that was probed.

What: /sys/devices/platform/bone_capemgr/baseboard/<eeprom-field>
Date: May 2015
KernelVersion: 4.0
Contact: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Description: Contains the probed base board EEPROM field; one of:
board-name - board-name as stored in cape EEPROM
dc-supplied - whether the cape draws or supplies DC
eeprom-format-revision - EEPROM format rev, only 00A0 supported
header - header; should be 'aa 55 33 ee'
manufacturer - manufacturer string
part-number - part-number of the cape
serial-number - serial number of the cape
version - version of the cape, i.e. 00A0
number-of-pins - displayed but ignored
pin-usage - displayed but ignored
sys-5v - displayed but ignored
vdd-3v3exp - displayed but ignored
vdd-5v - displayed but ignored
What: /sys/devices/platform/bone_capemgr/slot-<n>/<eeprom-field>
Date: May 2015
KernelVersion: 4.0
Contact: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Description: Contains the probed cape's EEPROM field; the field is one of:
board-name - baseboard name i.e. A335BNLT
header - header; should be 'aa 55 33 ee'
revision - baseboard revision
serial-number - baseboard serial number
config-option - displayed but ignored
52 changes: 52 additions & 0 deletions Documentation/ABI/testing/sysfs-firmware-devicetree-overlays
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
What: /sys/firmware/devicetree/overlays/
Date: October 2015
Contact: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Description:
This directory contains the applied device tree overlays of
the running system, as directories of the overlay id.

What: /sys/firmware/devicetree/overlays/enable
Date: October 2015
Contact: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Description:
The master enable switch, by default is 1, and when
set to 0 it cannot be re-enabled for security reasons.

The discussion about this switch takes place in:
http://comments.gmane.org/gmane.linux.drivers.devicetree/101871

Kees Cook:
"Coming from the perspective of drawing a bright line between
kernel and the root user (which tends to start with disabling
kernel module loading), I would say that there at least needs
to be a high-level one-way "off" switch for the interface so
that systems that have this interface can choose to turn it off
during initial boot, etc."

What: /sys/firmware/devicetree/overlays/<id>
Date: October 2015
Contact: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Description:
Each directory represents an applied overlay, containing
the following attribute files.

What: /sys/firmware/devicetree/overlays/<id>/can_remove
Date: October 2015
Contact: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Description:
The attribute set to 1 means that the overlay can be removed,
while 0 means that the overlay is being overlapped therefore
removal is prohibited.

What: /sys/firmware/devicetree/overlays/<id>/<fragment-name>/
Date: October 2015
Contact: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Description:
Each of these directories contain information about of the
particular overlay fragment.

What: /sys/firmware/devicetree/overlays/<id>/<fragment-name>/target
Date: October 2015
Contact: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Description:
The full-path of the target of the fragment
2 changes: 2 additions & 0 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
@@ -2883,6 +2883,8 @@
This can be set from sysctl after boot.
See Documentation/sysctl/vm.txt for details.

of_overlay_disable [OF] Disable device tree overlays at boot time.

ohci1394_dma=early [HW] enable debugging via the ohci1394 driver.
See Documentation/debugging-via-ohci1394.txt for more
info.
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/arm/omap/omap.txt
Original file line number Diff line number Diff line change
@@ -24,6 +24,8 @@ Optional properties:
- ti,no-reset-on-init: When present, the module should not be reset at init
- ti,no-idle-on-init: When present, the module should not be idled at init
- ti,no-idle: When present, the module is never allowed to idle.
- ti,deassert-hard-reset: list of hwmod and hardware reset line name pairs
(ascii strings) to be deasserted upon device instantiation.

Example:

111 changes: 111 additions & 0 deletions Documentation/devicetree/bindings/misc/bone_capemgr.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
* Beaglebone cape manager driver

Required properties:
- compatible: "ti,bone-capemgr"
- eeprom: phandle to the EEPROM baseboard.
The EEPROM framework interface is use to obtain the data.

Required children nodes:

- baseboardmaps: Contains nodes, which each of the them defines a mapping from
the baseboard EEPROM board-name ID to a DT friendly compatible
string.

- board-name: The baseboard EEPROM board name, i.e. A335BONE for the
original beaglebone white.
- compatible-name: The DT friendly compatible string to be used for matching
compatible capes, i.e. "ti,beaglebone"


- nvmem-cells: Defines the phandles of the nvmem cells of the baseboard and the
slots.
- nvmem-cells: Defines the names of the nvmem cells. Required to have at
least a baseboard cell name.

- #slots: Defines how many slots are there.

- Example of a beaglebone cape-manager:

bone_capemgr {
compatible = "ti,bone-capemgr";
status = "okay";

nvmem-cell = <&baseboard_data
&cape0_data &cape1_data &cape2_data &cape3_data>;
nvmem-cell-names = "baseboard", "slot0", "slot1", "slot2", "slot3";

#slots = <4>;

/* map board revisions to compatible definitions */
baseboardmaps {
baseboard_beaglebone: board@0 {
board-name = "A335BONE";
compatible-name = "ti,beaglebone";
};

baseboard_beaglebone_black: board@1 {
board-name = "A335BNLT";
compatible-name = "ti,beaglebone-black";
};
};
};

The format of the cape to be loaded is in a standard overlay format with
the following root properties that are interpreted by the cape manager:

Required properties:
- compatible: Should be compatible to the baseboard according to the
baseboard map value, i.e. "ti,beaglebone".
- part-numer: Should contain the part-number as stored in the EEPROM.
- version: Should contain a list of all the version that are supported
by the single cape dtbo, i.e. "00A1".

Optional properties:
- exclusive-use: A string list which state the resources this cape requires.
No processing or matching to anything regarding the internal
kernel state is performed; it's purpose is to guard against
conflicts with other capes.
- priority: A priority to be assigned when loading a cape. A lower value
has higher priority. The purpose of the priority is to control
which cape is loaded first in case of a conflict.

- Example of a serial cape:

/dts-v1/;
/plugin/;
/ {
compatible = "ti,beaglebone", "ti,beaglebone-black";

/* identification */
part-number = "BB-BONE-SERL-03";
version = "00A1";

/* state the resources this cape uses */
exclusive-use =
/* the pin header uses */
"P9.21", /* uart2_txd */
"P9.22", /* uart2_rxd */
/* the hardware ip uses */
"uart2";

fragment@0 {
target = <&am33xx_pinmux>;
__overlay__ {
bb_uart2_pins: pinmux_bb_uart2_pins {
pinctrl-single,pins = <
0x150 0x21 /* spi0_sclk.uart2_rxd | MODE1 */
0x154 0x01 /* spi0_d0.uart2_txd | MODE1 */
>;
};
};
};

fragment@1 {
target = <&uart2>;
__overlay__ {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&bb_uart2_pins>;
};
};
};
31 changes: 31 additions & 0 deletions Documentation/devicetree/configfs-overlays.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Howto use the configfs overlay interface.

A device-tree configfs entry is created in /config/device-tree/overlays
and and it is manipulated using standard file system I/O.
Note that this is a debug level interface, for use by developers and
not necessarily something accessed by normal users due to the
security implications of having direct access to the kernel's device tree.

* To create an overlay you mkdir the directory:

# mkdir /config/device-tree/overlays/foo

* Either you echo the overlay firmware file to the path property file.

# echo foo.dtbo >/config/device-tree/overlays/foo/path

* Or you cat the contents of the overlay to the dtbo file

# cat foo.dtbo >/config/device-tree/overlays/foo/dtbo

The overlay file will be applied, and devices will be created/destroyed
as required.

To remove it simply rmdir the directory.

# rmdir /config/device-tree/overlays/foo

The rationalle of the dual interface (firmware & direct copy) is that each is
better suited to different use patterns. The firmware interface is what's
intended to be used by hardware managers in the kernel, while the copy interface
make sense for developers (since it avoids problems with namespaces).
Loading