This patch series is based on the latest pci/rcar branch of Lorenzo's pci.git.
The commit 175cc093888e ("PCI: rcar: Fix missing MACCTLR register setting
in rcar_pcie_hw_init()") description/code don't follow the manual
accurately, so that it's difficult to understand. So, this patch
series reverts the commit at first, and then applies a new fixed patch.
Reference:
https://marc.info/?l=linux-renesas-soc&m=157242422327368&w=2
Changes from v3:
- Add Geet-san's Acked-by into the patch 1/2.
- Fix a #define name in the patch 2/2.
- Remove reduntancy comment from the patch 2/2.
- Add Geet-san's Reviewed-by into the patch 2/2.
https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=197851
Changes from v2:
- Rebase on the latest pcir/rcar branch.
- Add Euguniu-san's Reported-by in the patch 2/2.
- Add the bits definitions instead of magic number to make the initial value
so that I don't add Euguniu-san's Reviewed-by tag in the patch 2/2.
https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=196557
Changes from v1:
- Follow -stable rule in patch 1/2.
- Add some comments about SPCHG bit of MACCTLR register.
https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=195717
Yoshihiro Shimoda (2):
Revert "PCI: rcar: Fix missing MACCTLR register setting in
rcar_pcie_hw_init()"
PCI: rcar: Fix missing MACCTLR register setting in initialize sequence
drivers/pci/controller/pcie-rcar.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--
2.7.4
With power gating moved out of the tpm_transmit code we need
to power on the TPM prior to calling tpm_get_timeouts.
Cc: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com>
Cc: Peter Huewe <peterhuewe(a)gmx.de>
Cc: Jason Gunthorpe <jgg(a)ziepe.ca>
Cc: linux-kernel(a)vger.kernel.org
Cc: stable(a)vger.kernel.org
Fixes: a3fbfae82b4c ("tpm: take TPM chip power gating out of tpm_transmit()")
Reported-by: Christian Bundy <christianbundy(a)fraction.io>
Signed-off-by: Jerry Snitselaar <jsnitsel(a)redhat.com>
---
v2: fix stable cc to correct address
drivers/char/tpm/tpm_tis_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index 270f43acbb77..cb101cec8f8b 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -974,13 +974,14 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
* to make sure it works. May as well use that command to set the
* proper timeouts for the driver.
*/
+ tpm_chip_start(chip);
if (tpm_get_timeouts(chip)) {
dev_err(dev, "Could not get TPM timeouts and durations\n");
rc = -ENODEV;
+ tpm_stop_chip(chip);
goto out_err;
}
- tpm_chip_start(chip);
chip->flags |= TPM_CHIP_FLAG_IRQ;
if (irq) {
tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED,
--
2.24.0
Hello,
We ran automated tests on a patchset that was proposed for merging into this
kernel tree. The patches were applied to:
Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 81584694bb70 - Linux 5.3.10
The results of these automated tests are provided below.
Overall result: PASSED
Merge: OK
Compile: OK
Tests: OK
All kernel binaries, config files, and logs are available for download here:
https://artifacts.cki-project.org/pipelines/279139
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Merge testing
-------------
We cloned this repository and checked out the following commit:
Repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
Commit: 81584694bb70 - Linux 5.3.10
We grabbed the a86abb74709c commit of the stable queue repository.
We then merged the patchset with `git am`:
bonding-fix-state-transition-issue-in-link-monitoring.patch
cdc-ncm-handle-incomplete-transfer-of-mtu.patch
ipv4-fix-table-id-reference-in-fib_sync_down_addr.patch
net-ethernet-octeon_mgmt-account-for-second-possible-vlan-header.patch
net-fix-data-race-in-neigh_event_send.patch
net-qualcomm-rmnet-fix-potential-uaf-when-unregistering.patch
net-tls-fix-sk_msg-trim-on-fallback-to-copy-mode.patch
net-usb-qmi_wwan-add-support-for-dw5821e-with-esim-support.patch
nfc-fdp-fix-incorrect-free-object.patch
nfc-netlink-fix-double-device-reference-drop.patch
nfc-st21nfca-fix-double-free.patch
qede-fix-null-pointer-deref-in-__qede_remove.patch
net-mscc-ocelot-don-t-handle-netdev-events-for-other-netdevs.patch
net-mscc-ocelot-fix-null-pointer-on-lag-slave-removal.patch
net-tls-don-t-pay-attention-to-sk_write_pending-when-pushing-partial-records.patch
net-tls-add-a-tx-lock.patch
selftests-tls-add-test-for-concurrent-recv-and-send.patch
ipv6-fixes-rt6_probe-and-fib6_nh-last_probe-init.patch
net-hns-fix-the-stray-netpoll-locks-causing-deadlock-in-napi-path.patch
net-prevent-load-store-tearing-on-sk-sk_stamp.patch
net-sched-prevent-duplicate-flower-rules-from-tcf_proto-destroy-race.patch
net-smc-fix-ethernet-interface-refcounting.patch
vsock-virtio-fix-sock-refcnt-holding-during-the-shutdown.patch
r8169-fix-page-read-in-r8168g_mdio_read.patch
alsa-timer-fix-incorrectly-assigned-timer-instance.patch
alsa-bebob-fix-to-detect-configured-source-of-sampling-clock-for-focusrite-saffire-pro-i-o-series.patch
alsa-hda-ca0132-fix-possible-workqueue-stall.patch
mm-memcontrol-fix-null-ptr-deref-in-percpu-stats-flush.patch
mm-memcontrol-fix-network-errors-from-failing-__gfp_atomic-charges.patch
mm-meminit-recalculate-pcpu-batch-and-high-limits-after-init-completes.patch
mm-thp-handle-page-cache-thp-correctly-in-pagetranscompoundmap.patch
mm-vmstat-hide-proc-pagetypeinfo-from-normal-users.patch
dump_stack-avoid-the-livelock-of-the-dump_lock.patch
mm-slab-make-page_cgroup_ino-to-recognize-non-compound-slab-pages-properly.patch
btrfs-consider-system-chunk-array-size-for-new-system-chunks.patch
btrfs-tree-checker-fix-wrong-check-on-max-devid.patch
btrfs-save-i_size-to-avoid-double-evaluation-of-i_size_read-in-compress_file_range.patch
tools-gpio-use-building_out_of_srctree-to-determine-srctree.patch
pinctrl-intel-avoid-potential-glitches-if-pin-is-in-gpio-mode.patch
perf-tools-fix-time-sorting.patch
perf-map-use-zalloc-for-map_groups.patch
drm-radeon-fix-si_enable_smc_cac-failed-issue.patch
hid-wacom-generic-treat-serial-number-and-related-fields-as-unsigned.patch
mm-khugepaged-fix-might_sleep-warn-with-config_highpte-y.patch
soundwire-depend-on-acpi.patch
soundwire-depend-on-acpi-of.patch
soundwire-bus-set-initial-value-to-port_status.patch
blkcg-make-blkcg_print_stat-print-stats-only-for-online-blkgs.patch
arm64-do-not-mask-out-pte_rdonly-in-pte_same.patch
asoc-rsnd-dma-fix-ssi9-4-5-6-7-busif-dma-address.patch
ceph-fix-use-after-free-in-__ceph_remove_cap.patch
ceph-fix-rcu-case-handling-in-ceph_d_revalidate.patch
ceph-add-missing-check-in-d_revalidate-snapdir-handling.patch
ceph-don-t-try-to-handle-hashed-dentries-in-non-o_creat-atomic_open.patch
ceph-don-t-allow-copy_file_range-when-stripe_count-1.patch
iio-adc-stm32-adc-fix-stopping-dma.patch
iio-imu-adis16480-make-sure-provided-frequency-is-positive.patch
iio-imu-inv_mpu6050-fix-no-data-on-mpu6050.patch
iio-srf04-fix-wrong-limitation-in-distance-measuring.patch
arm-sunxi-fix-cpu-powerdown-on-a83t.patch
arm-dts-imx6-logicpd-re-enable-snvs-power-key.patch
cpufreq-intel_pstate-fix-invalid-epb-setting.patch
clone3-validate-stack-arguments.patch
netfilter-nf_tables-align-nft_expr-private-data-to-64-bit.patch
netfilter-ipset-fix-an-error-code-in-ip_set_sockfn_get.patch
intel_th-gth-fix-the-window-switching-sequence.patch
intel_th-pci-add-comet-lake-pch-support.patch
intel_th-pci-add-jasper-lake-pch-support.patch
x86-dumpstack-64-don-t-evaluate-exception-stacks-before-setup.patch
x86-apic-32-avoid-bogus-ldr-warnings.patch
smb3-fix-persistent-handles-reconnect.patch
can-usb_8dev-fix-use-after-free-on-disconnect.patch
can-flexcan-disable-completely-the-ecc-mechanism.patch
can-c_can-c_can_poll-only-read-status-register-after-status-irq.patch
can-peak_usb-fix-a-potential-out-of-sync-while-decoding-packets.patch
can-rx-offload-can_rx_offload_queue_sorted-fix-error-handling-avoid-skb-mem-leak.patch
can-gs_usb-gs_can_open-prevent-memory-leak.patch
can-dev-add-missing-of_node_put-after-calling-of_get_child_by_name.patch
can-mcba_usb-fix-use-after-free-on-disconnect.patch
can-peak_usb-fix-slab-info-leak.patch
configfs-fix-a-deadlock-in-configfs_symlink.patch
alsa-usb-audio-more-validations-of-descriptor-units.patch
alsa-usb-audio-simplify-parse_audio_unit.patch
alsa-usb-audio-unify-the-release-of-usb_mixer_elem_info-objects.patch
alsa-usb-audio-remove-superfluous-blength-checks.patch
alsa-usb-audio-clean-up-check_input_term.patch
alsa-usb-audio-fix-possible-null-dereference-at-create_yamaha_midi_quirk.patch
alsa-usb-audio-remove-some-dead-code.patch
alsa-usb-audio-fix-copy-paste-error-in-the-validator.patch
usbip-implement-sg-support-to-vhci-hcd-and-stub-driver.patch
hid-google-add-magnemite-masterball-usb-ids.patch
dmaengine-sprd-fix-the-link-list-pointer-register-co.patch
bpf-lwtunnel-fix-reroute-supplying-invalid-dst.patch
dmaengine-xilinx_dma-fix-64-bit-simple-axidma-transf.patch
dmaengine-xilinx_dma-fix-control-reg-update-in-vdma_.patch
dmaengine-sprd-fix-the-possible-memory-leak-issue.patch
hid-intel-ish-hid-fix-wrong-error-handling-in-ishtp_.patch
powerpc-32s-fix-allow-prevent_user_access-when-cross.patch
rdma-mlx5-clear-old-rate-limit-when-closing-qp.patch
iw_cxgb4-fix-ecn-check-on-the-passive-accept.patch
rdma-siw-free-siw_base_qp-in-kref-release-routine.patch
rdma-qedr-fix-reported-firmware-version.patch
ib-core-use-rdma_read_gid_l2_fields-to-compare-gid-l.patch
net-mlx5e-tx-fix-assumption-of-single-wqebb-of-nop-i.patch
net-mlx5e-ktls-release-reference-on-dumped-fragments.patch
net-mlx5e-tx-fix-consumer-index-of-error-cqe-dump.patch
net-mlx5-prevent-memory-leak-in-mlx5_fpga_conn_creat.patch
net-mlx5-fix-memory-leak-in-mlx5_fw_fatal_reporter_d.patch
selftests-bpf-more-compatible-nc-options-in-test_tc_.patch
scsi-qla2xxx-fixup-incorrect-usage-of-host_byte.patch
scsi-lpfc-check-queue-pointer-before-use.patch
scsi-ufs-bsg-wake-the-device-before-sending-raw-upiu.patch
arc-plat-hsdk-enable-on-board-spi-nor-flash-ic.patch
rdma-uverbs-prevent-potential-underflow.patch
bpf-fix-use-after-free-in-subprog-s-jited-symbol-rem.patch
net-stmmac-fix-the-problem-of-tso_xmit.patch
net-openvswitch-free-vport-unless-register_netdevice.patch
scsi-lpfc-honor-module-parameter-lpfc_use_adisc.patch
scsi-qla2xxx-initialized-mailbox-to-prevent-driver-l.patch
bpf-fix-use-after-free-in-bpf_get_prog_name.patch
iwlwifi-pcie-fix-pci-id-0x2720-configs-that-should-b.patch
iwlwifi-pcie-fix-all-9460-entries-for-qnj.patch
iwlwifi-pcie-0x2720-is-qu-and-0x30dc-is-not.patch
netfilter-nf_flow_table-set-timeout-before-insertion.patch
drm-v3d-fix-memory-leak-in-v3d_submit_cl_ioctl.patch
xsk-fix-registration-of-rx-only-sockets.patch
net-phy-smsc-lan8740-add-phy_rst_after_clk_en-flag.patch
ipvs-don-t-ignore-errors-in-case-refcounting-ip_vs-m.patch
ipvs-move-old_secure_tcp-into-struct-netns_ipvs.patch
netfilter-nft_payload-fix-missing-check-for-matching.patch
rdma-nldev-skip-counter-if-port-doesn-t-match.patch
bonding-fix-unexpected-iff_bonding-bit-unset.patch
bonding-use-dynamic-lockdep-key-instead-of-subclass.patch
macsec-fix-refcnt-leak-in-module-exit-routine.patch
virt_wifi-fix-refcnt-leak-in-module-exit-routine.patch
scsi-sd-define-variable-dif-as-unsigned-int-instead-.patch
usb-dwc3-select-config_regmap_mmio.patch
usb-fsl-check-memory-resource-before-releasing-it.patch
usb-gadget-udc-atmel-fix-interrupt-storm-in-fifo-mod.patch
usb-gadget-composite-fix-possible-double-free-memory.patch
usb-dwc3-pci-prevent-memory-leak-in-dwc3_pci_probe.patch
usb-gadget-configfs-fix-concurrent-issue-between-com.patch
usb-dwc3-remove-the-call-trace-of-usbx_gfladj.patch
perf-x86-amd-ibs-fix-reading-of-the-ibs-opdata-regis.patch
perf-x86-amd-ibs-handle-erratum-420-only-on-the-affe.patch
perf-x86-uncore-fix-event-group-support.patch
usb-skip-endpoints-with-0-maxpacket-length.patch
usb-ldusb-use-unsigned-size-format-specifiers.patch
usbip-tools-fix-read_usb_vudc_device-error-path-hand.patch
rdma-iw_cxgb4-avoid-freeing-skb-twice-in-arp-failure.patch
rdma-hns-prevent-memory-leaks-of-eq-buf_list.patch
hwmon-ina3221-fix-read-timeout-issue.patch
scsi-qla2xxx-stop-timer-in-shutdown-path.patch
sched-topology-don-t-try-to-build-empty-sched-domain.patch
sched-topology-allow-sched_asym_cpucapacity-to-be-di.patch
nvme-multipath-fix-possible-io-hang-after-ctrl-recon.patch
fjes-handle-workqueue-allocation-failure.patch
net-hisilicon-fix-trying-to-free-already-free-irq.patch
wimax-i2400-fix-memory-leak-in-i2400m_op_rfkill_sw_t.patch
net-mscc-ocelot-fix-vlan_filtering-when-enslaving-to.patch
net-mscc-ocelot-refuse-to-overwrite-the-port-s-nativ.patch
iommu-amd-apply-the-same-ivrs-ioapic-workaround-to-a.patch
mt76-dma-fix-buffer-unmap-with-non-linear-skbs.patch
drm-amdgpu-sdma5-do-not-execute-0-sized-ibs-v2.patch
drm-sched-set-error-to-s_fence-if-hw-job-submission-.patch
drm-amdgpu-if-amdgpu_ib_schedule-fails-return-back-t.patch
drm-amd-display-do-not-synchronize-drr-displays.patch
drm-amd-display-add-50us-buffer-as-wa-for-pstate-swi.patch
drm-amd-display-passive-dp-hdmi-dongle-detection-fix.patch
dc.c-use-kzalloc-without-test.patch
sunrpc-the-tcp-back-channel-mustn-t-disappear-while-.patch
sunrpc-the-rdma-back-channel-mustn-t-disappear-while.patch
sunrpc-destroy-the-back-channel-when-we-destroy-the-.patch
hv_netvsc-fix-error-handling-in-netvsc_attach.patch
efi-tpm-return-einval-when-determining-tpm-final-eve.patch
efi-libstub-arm-account-for-firmware-reserved-memory.patch
x86-efi-never-relocate-kernel-below-lowest-acceptabl.patch
arm64-cpufeature-enable-qualcomm-falkor-errata-1009-.patch
usb-dwc3-gadget-fix-race-when-disabling-ep-with-canc.patch
arm64-apply-arm64_erratum_845719-workaround-for-brah.patch
arm64-brahma-b53-is-ssb-and-spectre-v2-safe.patch
arm64-apply-arm64_erratum_843419-workaround-for-brah.patch
nfsv4-don-t-allow-a-cached-open-with-a-revoked-deleg.patch
net-ethernet-arc-add-the-missed-clk_disable_unprepar.patch
igb-fix-constant-media-auto-sense-switching-when-no-.patch
e1000-fix-memory-leaks.patch
gve-fixes-dma-synchronization.patch
ocfs2-protect-extent-tree-in-ocfs2_prepare_inode_for.patch
pinctrl-cherryview-fix-irq_valid_mask-calculation.patch
clk-imx8m-use-sys_pll1_800m-as-intermediate-parent-o.patch
timekeeping-vsyscall-update-vdso-data-unconditionall.patch
mm-filemap.c-don-t-initiate-writeback-if-mapping-has-no-dirty-pages.patch
cgroup-writeback-don-t-switch-wbs-immediately-on-dead-wbs-if-the-memcg-is-dead.patch
Compile testing
---------------
We compiled the kernel for 3 architectures:
aarch64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
ppc64le:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
x86_64:
make options: -j30 INSTALL_MOD_STRIP=1 targz-pkg
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
✅ Boot test
✅ xfstests: xfs
✅ lvm thinp sanity
✅ storage: software RAID testing
🚧 ❌ selinux-policy: serge-testsuite
🚧 ✅ Storage blktests
Host 2:
✅ Boot test
✅ Podman system integration test (as root)
✅ Podman system integration test (as user)
✅ LTP lite
✅ Loopdev Sanity
✅ jvm test suite
✅ Memory function: kaslr
✅ AMTU (Abstract Machine Test Utility)
✅ LTP: openposix test suite
✅ Ethernet drivers sanity
✅ Networking MACsec: sanity
✅ Networking socket: fuzz
✅ Networking route: pmtu
✅ Networking route_func: local
✅ Networking route_func: forward
✅ audit: audit testsuite test
✅ httpd: mod_ssl smoke sanity
✅ iotop: sanity
✅ tuned: tune-processes-through-perf
✅ ALSA PCM loopback test
✅ ALSA Control (mixer) Userspace Element test
✅ Usex - version 1.9-29
✅ storage: SCSI VPD
🚧 ✅ CIFS Connectathon
🚧 ✅ POSIX pjd-fstest suites
ppc64le:
Host 1:
✅ Boot test
✅ Podman system integration test (as root)
✅ Podman system integration test (as user)
✅ LTP lite
✅ Loopdev Sanity
✅ jvm test suite
✅ Memory function: kaslr
✅ AMTU (Abstract Machine Test Utility)
✅ LTP: openposix test suite
✅ Ethernet drivers sanity
✅ Networking MACsec: sanity
✅ Networking socket: fuzz
✅ Networking route: pmtu
✅ Networking route_func: local
✅ Networking route_func: forward
✅ audit: audit testsuite test
✅ httpd: mod_ssl smoke sanity
✅ iotop: sanity
✅ tuned: tune-processes-through-perf
✅ ALSA PCM loopback test
✅ ALSA Control (mixer) Userspace Element test
✅ Usex - version 1.9-29
🚧 ✅ CIFS Connectathon
🚧 ✅ POSIX pjd-fstest suites
Host 2:
✅ Boot test
✅ xfstests: xfs
✅ lvm thinp sanity
✅ storage: software RAID testing
🚧 ❌ selinux-policy: serge-testsuite
🚧 ✅ Storage blktests
x86_64:
Host 1:
✅ Boot test
✅ xfstests: xfs
✅ lvm thinp sanity
✅ storage: software RAID testing
🚧 ✅ IOMMU boot test
🚧 ❌ selinux-policy: serge-testsuite
🚧 ✅ Storage blktests
Host 2:
✅ Boot test
✅ Podman system integration test (as root)
✅ Podman system integration test (as user)
✅ LTP lite
✅ Loopdev Sanity
✅ jvm test suite
✅ Memory function: kaslr
✅ AMTU (Abstract Machine Test Utility)
✅ LTP: openposix test suite
✅ Ethernet drivers sanity
✅ Networking MACsec: sanity
✅ Networking socket: fuzz
✅ Networking route: pmtu
✅ Networking route_func: local
✅ Networking route_func: forward
✅ audit: audit testsuite test
✅ httpd: mod_ssl smoke sanity
✅ iotop: sanity
✅ tuned: tune-processes-through-perf
✅ pciutils: sanity smoke test
✅ ALSA PCM loopback test
✅ ALSA Control (mixer) Userspace Element test
✅ Usex - version 1.9-29
✅ storage: SCSI VPD
✅ stress: stress-ng
🚧 ✅ CIFS Connectathon
🚧 ✅ POSIX pjd-fstest suites
Host 3:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test
🚧 ✅ /kernel/infiniband/env_setup
🚧 ⚡⚡⚡ /kernel/infiniband/sanity
Host 4:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
✅ Boot test
🚧 ✅ /kernel/infiniband/env_setup
🚧 ⚡⚡⚡ /kernel/infiniband/sanity
Host 5:
✅ Boot test
🚧 ✅ /kernel/infiniband/env_setup
🚧 ❌ /kernel/infiniband/sanity
Host 6:
✅ Boot test
🚧 ✅ /kernel/infiniband/env_setup
🚧 ❌ /kernel/infiniband/sanity
Test sources: https://github.com/CKI-project/tests-beaker
💚 Pull requests are welcome for new tests or improvements to existing tests!
Waived tests
------------
If the test run included waived tests, they are marked with 🚧. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
Testing timeout
---------------
We aim to provide a report within reasonable timeframe. Tests that haven't
finished running are marked with ⏱. Reports for non-upstream kernels have
a Beaker recipe linked to next to each host.
When PHY is not powered, the probe function fail and some resource are
still unallocated.
Furthermore some BUG happens:
dwmac-sun8i 5020000.ethernet: EMAC reset timeout
------------[ cut here ]------------
kernel BUG at /linux-next/net/core/dev.c:9844!
So let's use the right function (stmmac_pltfr_remove) in the error path.
Fixes: 9f93ac8d4085 ("net-next: stmmac: Add dwmac-sun8i")
Cc: <stable(a)vger.kernel.org> # v4.15+
Signed-off-by: Corentin Labbe <clabbe(a)baylibre.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index eefb06d918c8..1c8d84ed8410 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -1227,7 +1227,7 @@ static int sun8i_dwmac_probe(struct platform_device *pdev)
dwmac_mux:
sun8i_dwmac_unset_syscon(gmac);
dwmac_exit:
- sun8i_dwmac_exit(pdev, plat_dat->bsp_priv);
+ stmmac_pltfr_remove(pdev);
return ret;
}
--
2.23.0