aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-11-10 13:03:18 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-12-18 23:19:21 +0200
commitf5919b65d4c671fd5083838c7a445f319f9a13c8 (patch)
tree2c791d2a5dea5bbbb0b85f86f74afce2647c0726 /target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch
parent822b4c3b250a254e74407056ccfd5c6aa38da162 (diff)
downloadupstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.gz
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.bz2
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.zip
brcm2708: add kernel 4.14 support
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch97
1 files changed, 97 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch b/target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch
new file mode 100644
index 0000000000..f0b916e86c
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch
@@ -0,0 +1,97 @@
+From 6709752e7233afd929a130ac4f3645348be94c1f Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@armlinux.org.uk>
+Date: Tue, 2 Jan 2018 10:58:37 +0000
+Subject: [PATCH 294/454] net: phy: add unlocked accessors
+
+commit 788f9933db6172801336d0ae2dec5bdc7525389f upstream.
+
+Add unlocked versions of the bus accessors, which allows access to the
+bus with all the tracing. These accessors validate that the bus mutex
+is held, which is a basic requirement for all mii bus accesses.
+
+Also added is a read-modify-write unlocked accessor with the same
+locking requirements.
+
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/phy/phy-core.c | 25 +++++++++++++++++++++++++
+ include/linux/phy.h | 28 ++++++++++++++++++++++++++++
+ 2 files changed, 53 insertions(+)
+
+--- a/drivers/net/phy/phy-core.c
++++ b/drivers/net/phy/phy-core.c
+@@ -280,3 +280,28 @@ int phy_write_mmd(struct phy_device *phy
+ return ret;
+ }
+ EXPORT_SYMBOL(phy_write_mmd);
++
++/**
++ * __phy_modify() - Convenience function for modifying a PHY register
++ * @phydev: a pointer to a &struct phy_device
++ * @regnum: register number
++ * @mask: bit mask of bits to clear
++ * @set: bit mask of bits to set
++ *
++ * Unlocked helper function which allows a PHY register to be modified as
++ * new register value = (old register value & mask) | set
++ */
++int __phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set)
++{
++ int ret, res;
++
++ ret = __phy_read(phydev, regnum);
++ if (ret >= 0) {
++ res = __phy_write(phydev, regnum, (ret & ~mask) | set);
++ if (res < 0)
++ ret = res;
++ }
++
++ return ret;
++}
++EXPORT_SYMBOL_GPL(__phy_modify);
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -726,6 +726,18 @@ static inline int phy_read(struct phy_de
+ }
+
+ /**
++ * __phy_read - convenience function for reading a given PHY register
++ * @phydev: the phy_device struct
++ * @regnum: register number to read
++ *
++ * The caller must have taken the MDIO bus lock.
++ */
++static inline int __phy_read(struct phy_device *phydev, u32 regnum)
++{
++ return __mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, regnum);
++}
++
++/**
+ * phy_write - Convenience function for writing a given PHY register
+ * @phydev: the phy_device struct
+ * @regnum: register number to write
+@@ -741,6 +753,22 @@ static inline int phy_write(struct phy_d
+ }
+
+ /**
++ * __phy_write - Convenience function for writing a given PHY register
++ * @phydev: the phy_device struct
++ * @regnum: register number to write
++ * @val: value to write to @regnum
++ *
++ * The caller must have taken the MDIO bus lock.
++ */
++static inline int __phy_write(struct phy_device *phydev, u32 regnum, u16 val)
++{
++ return __mdiobus_write(phydev->mdio.bus, phydev->mdio.addr, regnum,
++ val);
++}
++
++int __phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set);
++
++/**
+ * phy_interrupt_is_valid - Convenience function for testing a given PHY irq
+ * @phydev: the phy_device struct
+ *