aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-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-0292-net-mdiobus-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-0292-net-mdiobus-add-unlocked-accessors.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch141
1 files changed, 141 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch b/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch
new file mode 100644
index 0000000000..5aec47e604
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch
@@ -0,0 +1,141 @@
+From b2b8b06f18281c637da274b18e330bc52351637e Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@armlinux.org.uk>
+Date: Tue, 2 Jan 2018 10:58:27 +0000
+Subject: [PATCH 292/454] net: mdiobus: add unlocked accessors
+
+commit 34dc08e4be208539b7c4aa8154a610e1736705e8 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.
+
+Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/phy/mdio_bus.c | 65 +++++++++++++++++++++++++++++++-------
+ include/linux/mdio.h | 3 ++
+ 2 files changed, 56 insertions(+), 12 deletions(-)
+
+--- a/drivers/net/phy/mdio_bus.c
++++ b/drivers/net/phy/mdio_bus.c
+@@ -493,6 +493,55 @@ struct phy_device *mdiobus_scan(struct m
+ EXPORT_SYMBOL(mdiobus_scan);
+
+ /**
++ * __mdiobus_read - Unlocked version of the mdiobus_read function
++ * @bus: the mii_bus struct
++ * @addr: the phy address
++ * @regnum: register number to read
++ *
++ * Read a MDIO bus register. Caller must hold the mdio bus lock.
++ *
++ * NOTE: MUST NOT be called from interrupt context.
++ */
++int __mdiobus_read(struct mii_bus *bus, int addr, u32 regnum)
++{
++ int retval;
++
++ WARN_ON_ONCE(!mutex_is_locked(&bus->mdio_lock));
++
++ retval = bus->read(bus, addr, regnum);
++
++ trace_mdio_access(bus, 1, addr, regnum, retval, retval);
++
++ return retval;
++}
++EXPORT_SYMBOL(__mdiobus_read);
++
++/**
++ * __mdiobus_write - Unlocked version of the mdiobus_write function
++ * @bus: the mii_bus struct
++ * @addr: the phy address
++ * @regnum: register number to write
++ * @val: value to write to @regnum
++ *
++ * Write a MDIO bus register. Caller must hold the mdio bus lock.
++ *
++ * NOTE: MUST NOT be called from interrupt context.
++ */
++int __mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val)
++{
++ int err;
++
++ WARN_ON_ONCE(!mutex_is_locked(&bus->mdio_lock));
++
++ err = bus->write(bus, addr, regnum, val);
++
++ trace_mdio_access(bus, 0, addr, regnum, val, err);
++
++ return err;
++}
++EXPORT_SYMBOL(__mdiobus_write);
++
++/**
+ * mdiobus_read_nested - Nested version of the mdiobus_read function
+ * @bus: the mii_bus struct
+ * @addr: the phy address
+@@ -512,11 +561,9 @@ int mdiobus_read_nested(struct mii_bus *
+ BUG_ON(in_interrupt());
+
+ mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
+- retval = bus->read(bus, addr, regnum);
++ retval = __mdiobus_read(bus, addr, regnum);
+ mutex_unlock(&bus->mdio_lock);
+
+- trace_mdio_access(bus, 1, addr, regnum, retval, retval);
+-
+ return retval;
+ }
+ EXPORT_SYMBOL(mdiobus_read_nested);
+@@ -538,11 +585,9 @@ int mdiobus_read(struct mii_bus *bus, in
+ BUG_ON(in_interrupt());
+
+ mutex_lock(&bus->mdio_lock);
+- retval = bus->read(bus, addr, regnum);
++ retval = __mdiobus_read(bus, addr, regnum);
+ mutex_unlock(&bus->mdio_lock);
+
+- trace_mdio_access(bus, 1, addr, regnum, retval, retval);
+-
+ return retval;
+ }
+ EXPORT_SYMBOL(mdiobus_read);
+@@ -568,11 +613,9 @@ int mdiobus_write_nested(struct mii_bus
+ BUG_ON(in_interrupt());
+
+ mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
+- err = bus->write(bus, addr, regnum, val);
++ err = __mdiobus_write(bus, addr, regnum, val);
+ mutex_unlock(&bus->mdio_lock);
+
+- trace_mdio_access(bus, 0, addr, regnum, val, err);
+-
+ return err;
+ }
+ EXPORT_SYMBOL(mdiobus_write_nested);
+@@ -595,11 +638,9 @@ int mdiobus_write(struct mii_bus *bus, i
+ BUG_ON(in_interrupt());
+
+ mutex_lock(&bus->mdio_lock);
+- err = bus->write(bus, addr, regnum, val);
++ err = __mdiobus_write(bus, addr, regnum, val);
+ mutex_unlock(&bus->mdio_lock);
+
+- trace_mdio_access(bus, 0, addr, regnum, val, err);
+-
+ return err;
+ }
+ EXPORT_SYMBOL(mdiobus_write);
+--- a/include/linux/mdio.h
++++ b/include/linux/mdio.h
+@@ -257,6 +257,9 @@ static inline u16 ethtool_adv_to_mmd_eee
+ return reg;
+ }
+
++int __mdiobus_read(struct mii_bus *bus, int addr, u32 regnum);
++int __mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val);
++
+ int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum);
+ int mdiobus_read_nested(struct mii_bus *bus, int addr, u32 regnum);
+ int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val);