mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
f5919b65d4
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>
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
From 2d490ea00f141384d57c7e18e44b34e94e572b26 Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Tue, 2 Jan 2018 10:58:32 +0000
|
|
Subject: [PATCH 293/454] net: phy: use unlocked accessors for indirect MMD
|
|
accesses
|
|
|
|
commit 1b2dea2e6a6e3399e88784d57aea80f4fd5e8956 upstream.
|
|
|
|
Use unlocked accessors for indirect MMD accesses to clause 22 PHYs.
|
|
This permits tracing of these 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/phy-core.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phy-core.c
|
|
+++ b/drivers/net/phy/phy-core.c
|
|
@@ -193,13 +193,14 @@ static void mmd_phy_indirect(struct mii_
|
|
u16 regnum)
|
|
{
|
|
/* Write the desired MMD Devad */
|
|
- bus->write(bus, phy_addr, MII_MMD_CTRL, devad);
|
|
+ __mdiobus_write(bus, phy_addr, MII_MMD_CTRL, devad);
|
|
|
|
/* Write the desired MMD register address */
|
|
- bus->write(bus, phy_addr, MII_MMD_DATA, regnum);
|
|
+ __mdiobus_write(bus, phy_addr, MII_MMD_DATA, regnum);
|
|
|
|
/* Select the Function : DATA with no post increment */
|
|
- bus->write(bus, phy_addr, MII_MMD_CTRL, devad | MII_MMD_CTRL_NOINCR);
|
|
+ __mdiobus_write(bus, phy_addr, MII_MMD_CTRL,
|
|
+ devad | MII_MMD_CTRL_NOINCR);
|
|
}
|
|
|
|
/**
|
|
@@ -232,7 +233,7 @@ int phy_read_mmd(struct phy_device *phyd
|
|
mmd_phy_indirect(bus, phy_addr, devad, regnum);
|
|
|
|
/* Read the content of the MMD's selected register */
|
|
- val = bus->read(bus, phy_addr, MII_MMD_DATA);
|
|
+ val = __mdiobus_read(bus, phy_addr, MII_MMD_DATA);
|
|
mutex_unlock(&bus->mdio_lock);
|
|
}
|
|
return val;
|
|
@@ -271,7 +272,7 @@ int phy_write_mmd(struct phy_device *phy
|
|
mmd_phy_indirect(bus, phy_addr, devad, regnum);
|
|
|
|
/* Write the data into MMD's selected register */
|
|
- bus->write(bus, phy_addr, MII_MMD_DATA, val);
|
|
+ __mdiobus_write(bus, phy_addr, MII_MMD_DATA, val);
|
|
mutex_unlock(&bus->mdio_lock);
|
|
|
|
ret = 0;
|