Merge changes from sid up to 3.16.7-ckt2-1
svn path=/dists/trunk/linux/; revision=22148
This commit is contained in:
Ben Hutchings
commit
e0ff76482a
|
|
@ -0,0 +1,76 @@
|
|||
#!/bin/bash -eu
|
||||
|
||||
if [ $# -ne 2 ]; then
|
||||
echo >&2 "Usage: $0 REPO VERSION"
|
||||
echo >&2 "REPO is the git repository to generate a changelog from"
|
||||
echo >&2 "VERSION is the stable version (without leading v)"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# Get base version, i.e. the stable release that a branch started from
|
||||
base_version() {
|
||||
local ver
|
||||
ver="${1%-rc*}"
|
||||
case "$ver" in
|
||||
*-ckt*)
|
||||
ver="${ver%-*}"
|
||||
;;
|
||||
esac
|
||||
echo "$ver"
|
||||
}
|
||||
|
||||
add_update() {
|
||||
local base update
|
||||
base="$(base_version "$1")"
|
||||
update="${1#$base-ckt}"
|
||||
if [ "$update" = "$1" ]; then
|
||||
update=0
|
||||
fi
|
||||
update="$((update + $2))"
|
||||
if [ $update = 0 ]; then
|
||||
echo "$base"
|
||||
else
|
||||
echo "$base-ckt$update"
|
||||
fi
|
||||
}
|
||||
|
||||
# Get next stable update version
|
||||
next_update() {
|
||||
add_update "$1" 1
|
||||
}
|
||||
|
||||
export GIT_DIR="$1/.git"
|
||||
|
||||
new_ver="$2"
|
||||
cur_pkg_ver="$(dpkg-parsechangelog | sed -n 's/^Version: //p')"
|
||||
cur_ver="${cur_pkg_ver%-*}"
|
||||
|
||||
if [ "$(base_version "$new_ver")" != "$(base_version "$cur_ver")" ]; then
|
||||
echo >&2 "$new_ver is not on the same stable series as $cur_ver"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
case "$cur_pkg_ver" in
|
||||
*~exp*)
|
||||
new_pkg_ver="$new_ver-1~exp1"
|
||||
;;
|
||||
*)
|
||||
new_pkg_ver="$new_ver-1"
|
||||
;;
|
||||
esac
|
||||
|
||||
# dch insists on word-wrapping everything, so just add the first line initially
|
||||
dch -v "$new_pkg_ver" --preserve --multimaint-merge -D UNRELEASED \
|
||||
--release-heuristic=changelog 'New upstream stable update:'
|
||||
|
||||
# Then append the shortlogs with sed
|
||||
sed -i '1,/^ --/ { /New upstream stable update:/ { a\
|
||||
'"$(
|
||||
while [ "v$cur_ver" != "v$new_ver" ]; do
|
||||
next_ver="$(next_update "$cur_ver")"
|
||||
echo " http://kernel.ubuntu.com/stable/ChangeLog-$next_ver\\"
|
||||
git log --reverse --pretty=' - %s\' "v$cur_ver..v$next_ver^"
|
||||
cur_ver="$next_ver"
|
||||
done)"'
|
||||
|
||||
} }' debian/changelog
|
||||
|
|
@ -38,6 +38,280 @@ linux (3.17~rc5-1~exp1) experimental; urgency=medium
|
|||
|
||||
-- maximilian attems <maks@debian.org> Thu, 18 Sep 2014 23:50:00 +0200
|
||||
|
||||
linux (3.16.7-ckt2-1) unstable; urgency=high
|
||||
|
||||
* New upstream stable update:
|
||||
http://kernel.ubuntu.com/stable/ChangeLog-3.16.7-ckt1
|
||||
- drm/tilcdc: Fix the error path in tilcdc_load()
|
||||
- usb: phy: return -ENODEV on failure of try_module_get
|
||||
- PM / clk: Fix crash in clocks management code if !CONFIG_PM_RUNTIME
|
||||
- rt2x00: support Ralink 5362.
|
||||
- wireless: rt2x00: add new rt2800usb devices
|
||||
- NFS: Fix /proc/fs/nfsfs/servers and /proc/fs/nfsfs/volumes
|
||||
- nfs: fix duplicate proc entries
|
||||
- mm: page_alloc: fix zone allocation fairness on UP
|
||||
- ext4: check EA value offset when loading
|
||||
- jbd2: free bh when descriptor block checksum fails
|
||||
- ext4: don't check quota format when there are no quota files
|
||||
- target: Fix queue full status NULL pointer for SCF_TRANSPORT_TASK_SENSE
|
||||
- vfs: fix data corruption when blocksize < pagesize for mmaped data
|
||||
- ext4: fix mmap data corruption when blocksize < pagesize
|
||||
- ext4: grab missed write_count for EXT4_IOC_SWAP_BOOT
|
||||
- qla_target: don't delete changed nacls
|
||||
- target: Fix APTPL metadata handling for dynamic MappedLUNs
|
||||
- iser-target: Disable TX completion interrupt coalescing
|
||||
- ext4: don't orphan or truncate the boot loader inode
|
||||
- ext4: add ext4_iget_normal() which is to be used for dir tree lookups
|
||||
- ext4: fix reservation overflow in ext4_da_write_begin
|
||||
- ext4: Replace open coded mdata csum feature to helper function
|
||||
- ext4: move error report out of atomic context in ext4_init_block_bitmap()
|
||||
- ext4: check s_chksum_driver when looking for bg csum presence
|
||||
- drm/radeon: fix speaker allocation setup
|
||||
- drm/radeon: use gart memory for DMA ring tests
|
||||
- random: add and use memzero_explicit() for clearing data
|
||||
- freezer: Do not freeze tasks killed by OOM killer
|
||||
- OOM, PM: OOM killed task shouldn't escape PM suspend
|
||||
- [mips*/loongson-2f] loongson2_cpufreq: Fix CPU clock rate setting mismerge
|
||||
- drm/cirrus: bind also to qemu-xen-traditional
|
||||
- cpufreq: intel_pstate: Fix setting max_perf_pct in performance policy
|
||||
- cpufreq: expose scaling_cur_freq sysfs file for set_policy() drivers
|
||||
- cpufreq: intel_pstate: Reflect current no_turbo state correctly
|
||||
- [x86] intel_pstate: Don't lose sysfs settings during cpu offline
|
||||
- [x86] intel_pstate: Fix BYT frequency reporting
|
||||
- [x86] intel_pstate: Correct BYT VID values.
|
||||
- [x86] kvm: don't kill guest on unknown exit reason
|
||||
- kvm: fix excessive pages un-pinning in kvm_iommu_map error path.
|
||||
(CVE-2014-8369)
|
||||
- vfs: be careful with nd->inode in path_init() and follow_dotdot_rcu()
|
||||
- pstore: Fix duplicate {console,ftrace}-efi entries
|
||||
- [x86] bpf_jit: fix two bugs in eBPF JIT compiler (regression in 3.16)
|
||||
- vxlan: fix a use after free in vxlan_encap_bypass
|
||||
- vxlan: using pskb_may_pull as early as possible
|
||||
- vxlan: fix a free after use
|
||||
- ipv4: dst_entry leak in ip_send_unicast_reply()
|
||||
- ipv4: fix a potential use after free in ip_tunnel_core.c
|
||||
(regression in 3.11)
|
||||
- net: tso: fix unaligned access to crafted TCP header in helper API
|
||||
- [x86] hyperv: Fix the total_data_buflen in send path
|
||||
- tcp: md5: do not use alloc_percpu()
|
||||
- macvlan: fix a race on port dismantle and possible skb leaks
|
||||
(regression in 3.16)
|
||||
- net/mlx4_en: Don't attempt to TX offload the outer UDP checksum for VXLAN
|
||||
(regression in 3.14)
|
||||
- gre: Use inner mac length when computing tunnel length
|
||||
(regression in 3.14)
|
||||
- [armhf] spi: pl022: Fix incorrect dma_unmap_sg
|
||||
- mac80211: fix typo in starting baserate for rts_cts_rate_idx
|
||||
- staging: comedi: (regression) channel list must be set for COMEDI_CMD
|
||||
ioctl (regression in 3.15)
|
||||
- nfsd4: fix response size estimation for OP_SEQUENCE (regression in 3.16)
|
||||
- quota: Properly return errors from dquot_writeback_dquots()
|
||||
- i3200_edac: Report CE events properly
|
||||
- i82860_edac: Report CE events properly
|
||||
- cpc925_edac: Report UE events properly
|
||||
- e7xxx_edac: Report CE events properly
|
||||
- scsi: Fix error handling in SCSI_IOCTL_SEND_COMMAND
|
||||
- usb: serial: ftdi_sio: add "bricked" FTDI device PID
|
||||
- [armhf] Revert "usb: dwc3: dwc3-omap: Disable/Enable only wrapper
|
||||
interrupts in prepare/complete" (regression in 3.16)
|
||||
- usb: gadget: f_fs: remove redundant ffs_data_get() (regression in 3.14)
|
||||
- [armhf] usb: ffs: fix regression when quirk_ep_out_aligned_size flag is
|
||||
set (regression in 3.15)
|
||||
- [armhf] usb: musb: dsps: start OTG timer on resume again
|
||||
(regression in 3.16.6)
|
||||
- usb: gadget: udc: core: fix kernel oops with soft-connect
|
||||
- nfsd4: fix crash on unknown operation number
|
||||
- Revert "iwlwifi: mvm: treat EAPOLs like mgmt frames wrt rate"
|
||||
(regression in 3.16.4)
|
||||
- [armhf] usb: dwc3: gadget: Properly initialize LINK TRB
|
||||
- posix-timers: Fix stack info leak in timer_create()
|
||||
- futex: Fix a race condition between REQUEUE_PI and task death
|
||||
- ALSA: bebob: Uninitialized id returned by saffirepro_both_clk_src_get
|
||||
- PM / Sleep: fix async suspend_late/freeze_late error handling
|
||||
(regression in 3.15)
|
||||
- Revert "block: all blk-mq requests are tagged" (regression in 3.16)
|
||||
- ALSA: pcm: Zero-clear reserved fields of PCM status ioctl in compat mode
|
||||
- zap_pte_range: update addr when forcing flush after TLB batching faiure
|
||||
- staging: comedi: fix memory leak / bad pointer freeing for chanlist
|
||||
(regression in 3.15)
|
||||
- [x86] drm/i915: Ignore VBT backlight check on Macbook 2, 1
|
||||
(regression in 3.15)
|
||||
- [i386/686-pae] pageattr: Prevent overflow in slow_virt_to_phys() for
|
||||
X86_PAE
|
||||
- [x86] ACPI / EC: Fix regression due to conflicting firmware behavior
|
||||
between Samsung and Acer. (regression in 3.16.3)
|
||||
- mm: free compound page with correct order
|
||||
- lib/bitmap.c: fix undefined shift in __bitmap_shift_{left|right}()
|
||||
- ext4: fix overflow when updating superblock backups after resize
|
||||
- ext4: fix oops when loading block bitmap failed
|
||||
- ext4: enable journal checksum when metadata checksum feature enabled
|
||||
- ext4: prevent bugon on race between write/fcntl
|
||||
- ext4: bail out from make_indexed_dir() on first error
|
||||
- PCI: Rename sysfs 'enabled' file back to 'enable' (regression in 3.13)
|
||||
- fs: allow open(dir, O_TMPFILE|..., 0) with mode 0
|
||||
- [arm*] tracing/syscalls: Ignore numbers outside NR_syscalls' range
|
||||
- nfs: fix kernel warning when removing proc entry
|
||||
http://kernel.ubuntu.com/stable/ChangeLog-3.16.7-ckt2
|
||||
- rbd: Fix error recovery in rbd_obj_read_sync()
|
||||
- regulator: max77693: Fix use of uninitialized regulator config
|
||||
- xhci: no switching back on non-ULT Haswell (regression in 3.12)
|
||||
- Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup
|
||||
- ocfs2: fix breakage in o2net_send_tcp_msg() (regression in 3.15)
|
||||
- [armhf] phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
|
||||
(regression in 3.16)
|
||||
- USB: cdc-acm: add quirk for control-line state requests
|
||||
(regression in 3.16)
|
||||
- sysfs: driver core: Fix glue dir race condition by gdp_mutex
|
||||
- drm/nouveau: make sure display hardware is reinitialised on runtime
|
||||
resume (regression in 3.15)
|
||||
- drm/nv50/disp: fix dpms regression on certain boards
|
||||
- drm/nouveau/bios: memset dcb struct to zero before parsing
|
||||
- GFS2: Make rename not save dirent location (regression in 3.14)
|
||||
- netfilter: ipset: off by one in ip_set_nfnl_get_byindex()
|
||||
- netfilter: nf_tables: check for NULL in nf_tables_newchain pcpu stats
|
||||
allocation (regression in 3.16)
|
||||
- netfilter: nfnetlink_log: fix maximum packet length logged to userspace
|
||||
- netfilter: nft_compat: fix wrong target lookup in nft_target_select_ops()
|
||||
- mmc: core: sdio: Fix unconditional wake_up_process() on sdio thread
|
||||
(regression in 3.16)
|
||||
- mmc: don't request CD IRQ until mmc_start_host()
|
||||
- fs: make cont_expand_zero interruptible
|
||||
- UBIFS: fix a race condition
|
||||
- [x86] fpu: __restore_xstate_sig()->math_state_restore() needs
|
||||
preempt_disable()
|
||||
- [x86] fpu: shift drop_init_fpu() from save_xstate_sig() to
|
||||
handle_signal()
|
||||
- perf: Fix unclone_ctx() vs. locking
|
||||
- evm: properly handle INTEGRITY_NOXATTRS EVM status
|
||||
- [alpha] vfs: missing data dependency barrier in prepend_name()
|
||||
- jffs2: kill wbuf_queued/wbuf_dwork_lock
|
||||
- fix misuses of f_count() in ppp and netlink
|
||||
- sched: Use dl_bw_of() under RCU read lock
|
||||
- [s390*] topology: call set_sched_topology early
|
||||
- [armhf] mfd: ti_am335x_tscadc: Fix TSC operation after ADC continouous
|
||||
mode (regression in 3.14)
|
||||
- [armhf] mfd: ti_am335x_tscadc: Fix TSC resume (regression in 3.14)
|
||||
- selinux: fix inode security list corruption
|
||||
- blk-mq: fix potential hang if rolling wakeup depth is too high
|
||||
(regression in 3.16)
|
||||
- block: fix alignment_offset math that assumes io_min is a power-of-2
|
||||
- drm/nouveau/gpio: rename g92 class to g94 (regression in 3.16)
|
||||
- [x86] drm/i915: Do not leak pages when freeing userptr objects
|
||||
- media: v4l2-common: fix overflow in v4l_bound_align_image()
|
||||
- sched: Use rq->rd in sched_setaffinity() under RCU read lock
|
||||
- [powerpc*] use device_online/offline() instead of cpu_up/down()
|
||||
(regression in 3.11)
|
||||
- xen-blkback: fix leak on grant map error path
|
||||
- net: skb_fclone_busy() needs to detect orphaned skb (regression in 3.16)
|
||||
- rbd: avoid format-security warning inside alloc_workqueue()
|
||||
- rbd: fix error return code in rbd_dev_device_setup()
|
||||
- media: ttusb-dec: buffer overflow in ioctl (CVE-2014-8884)
|
||||
- dm raid: ensure superblock's size matches device's logical block size
|
||||
- ahci: disable MSI instead of NCQ on Samsung pci-e SSDs on macbooks
|
||||
(Closes: #772435)
|
||||
- mac80211: properly flush delayed scan work on interface removal
|
||||
- [i386] microcode, AMD: Fix early ucode loading on 32-bit
|
||||
(regression in 3.14)
|
||||
- [armhf] mvebu: armada xp: Generalize use of i2c quirk
|
||||
(regression in 3.12)
|
||||
- mac80211: fix use-after-free in defragmentation
|
||||
- iwlwifi: fix RFkill while calibrating (regression in 3.16)
|
||||
- tun: Fix csum_start with VLAN acceleration (regression in 3.12)
|
||||
- macvtap: Fix csum_start when VLAN tags are present
|
||||
- dm thin: grab a virtual cell before looking up the mapping
|
||||
- [x86] KVM: Fix uninitialized op->type for some immediate values
|
||||
- [powerpc*] hwrng: pseries - port to new read API and fix stack corruption
|
||||
- drm/radeon: set correct CE ram size for CIK
|
||||
- drm/radeon: make sure mode init is complete in bandwidth_update
|
||||
- cpufreq: Avoid crash in resume on SMP without OPP (regresion in 3.12)
|
||||
- [i386] microcode, AMD: Fix ucode patch stashing on 32-bit
|
||||
(regression in 3.14)
|
||||
- [armhf] mfd: twl4030-power: Fix poweroff with PM configuration enabled
|
||||
(regression in 3.16)
|
||||
- [hppa] Use compat layer for msgctl, shmat, shmctl and semtimedop syscalls
|
||||
- tracing: Do not busy wait in buffer splice (regresion in 3.16)
|
||||
- param: fix crash on bad kernel arguments (regression in 3.16)
|
||||
- audit: keep inode pinned
|
||||
- drm/radeon: add locking around atombios scratch space usage
|
||||
- nfs: fix pnfs direct write memory leak
|
||||
- nfs: Fix use of uninitialized variable in nfs_getattr()
|
||||
- NFSv4: Ensure that we remove NFSv4.0 delegations when state has expired
|
||||
- NFSv4.1: nfs41_clear_delegation_stateid shouldn't trust
|
||||
NFS_DELEGATED_STATE
|
||||
- NFSv4: Fix races between nfs_remove_bad_delegation() and delegation
|
||||
return
|
||||
- NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked
|
||||
- NFS: Don't try to reclaim delegation open state if recovery failed
|
||||
- [arm64] efi: Fix stub cache maintenance
|
||||
- [arm64] __clear_user: handle exceptions on strb (CVE-2014-7843)
|
||||
- [arm64] Correct the race condition in aarch64_insn_patch_text_sync()
|
||||
- Fix thinko in iov_iter_single_seg_count
|
||||
- libceph: do not crash on large auth tickets
|
||||
- [armel,armhf] 8191/1: decompressor: ensure I-side picks up relocated code
|
||||
- zram: avoid kunmap_atomic() of a NULL pointer
|
||||
- firewire: cdev: prevent kernel stack leaking into ioctl arguments
|
||||
- md: Always set RECOVERY_NEEDED when clearing RECOVERY_FROZEN
|
||||
(regression in 3.13)
|
||||
- vxlan: Do not reuse sockets for a different address family
|
||||
- net: sctp: fix NULL pointer dereference in af->from_addr_param on
|
||||
malformed packet (CVE-2014-7841)
|
||||
- net: sctp: fix memory leak in auth key management
|
||||
- [armel,m68k] ipv6: fix IPV6_PKTINFO with v4 mapped (regression in 3.15)
|
||||
- netlink: Properly unbind in error conditions. (regression in 3.16)
|
||||
- smsc911x: power-up phydev before doing a software reset.
|
||||
(regression in 3.14)
|
||||
- [sparc*] sunvdc: limit each sg segment to a page
|
||||
- [sparc*] vio: fix reuse of vio_dring slot
|
||||
- drm/radeon: initialize sadb to NULL in the audio code
|
||||
- [x86] KVM: Don't report guest userspace emulation error to userspace
|
||||
- crypto: caam - remove duplicated sg copy functions
|
||||
- audit: correct AUDIT_GET_FEATURE return message type
|
||||
- memory-hotplug: Remove "weak" from memory_block_size_bytes() declaration
|
||||
(regression in 3.14)
|
||||
- [s390*] vmcore: Remove "weak" from function declarations
|
||||
- [s390*] clocksource: Remove "weak" from clocksource_default_clock()
|
||||
declaration
|
||||
- IB/core: Clear AH attr variable to prevent garbage data
|
||||
- [amd64] x32, audit: Fix x32's AUDIT_ARCH wrt audit
|
||||
- [armhf] dts: am335x-evm: Fix 5th NAND partition's name
|
||||
(regression in 3.15)
|
||||
- dell-wmi: Fix access out of memory
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* [x86] Complete Thunderbolt support on Apple computers (Closes: #768653)
|
||||
- PCI: Add pci_fixup_suspend_late quirk pass
|
||||
- PCI: Suspend/resume quirks for Apple thunderbolt
|
||||
- Enable THUNDERBOLT as module
|
||||
* [amd64] traps: Stop using IST for #SS (CVE-2014-9090)
|
||||
* [amd64] traps: Fix the espfix64 #DF fixup and rewrite it in C
|
||||
* [amd64] traps: Rework bad_iret
|
||||
* [amd64] asm/traps: Disable tracing and kprobes in fixup_bad_iret and
|
||||
sync_regs
|
||||
* Fix ABI changes in iovec, of, perf and truncate
|
||||
* Ignore ABI changes in iwlwifi, KVM and spi-nor
|
||||
* Revert "drivers/net: Disable UFO through virtio" in macvtap and tun.
|
||||
This removes the need to shut down VMs if migrating to a patched
|
||||
host.
|
||||
|
||||
[ Ian Campbell ]
|
||||
* [xen] Backport various netback fixes (Closes: #767261).
|
||||
* Backport fix for TSO with mv643xx_eth driver, replacing previous workaround
|
||||
(#764162)
|
||||
* [armhf] Increase Ethernet phy startup delay on Banana-Pi. Patch from
|
||||
Karsten Merker (Closes: #767042)
|
||||
* [armhf] Enable FB_SIMPLE, used on some Exynos platforms and elsewhere.
|
||||
* [arm64] Backport various upstream fixes and improvements to the APM X-gene
|
||||
Ethernet driver.
|
||||
* Honour stdout-path from Device Tree, along with supporting any supplied
|
||||
options. (Closes: #770212)
|
||||
* [armhf] Add udeb modules to support video and keyboard for imx6. Patch from
|
||||
Vagrant Cascadian (Closes: #770635)
|
||||
* [device-tree] Reserve memreserve regions even if they partially overlap
|
||||
with an existing reservation. Fixes boot on Midway.
|
||||
* [arm64] Enable reboot on the Xgene platform.
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Mon, 08 Dec 2014 20:03:18 +0000
|
||||
|
||||
linux (3.16.7-2) unstable; urgency=medium
|
||||
|
||||
[ Ian Campbell ]
|
||||
|
|
|
|||
|
|
@ -822,6 +822,7 @@ CONFIG_FB=y
|
|||
CONFIG_FB_ARMCLCD=y
|
||||
CONFIG_FB_VT8500=y
|
||||
CONFIG_FB_WM8505=y
|
||||
CONFIG_FB_SIMPLE=y
|
||||
|
||||
##
|
||||
## file: drivers/video/fbdev/omap2/dss/Kconfig
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
imx-ipuv3-crtc
|
||||
imx-hdmi
|
||||
|
|
@ -5,3 +5,4 @@ ohci-exynos
|
|||
ehci-exynos
|
||||
phy-exynos-usb2
|
||||
ci_hdrc_imx
|
||||
phy-mxs-usb
|
||||
|
|
|
|||
|
|
@ -116,8 +116,9 @@ class VersionLinux(Version):
|
|||
\d+\.\d+
|
||||
)
|
||||
(?P<update>
|
||||
\.\d+
|
||||
)?
|
||||
(?:\.\d+)?
|
||||
(?:-[a-z]+\d+)?
|
||||
)
|
||||
(?:
|
||||
~
|
||||
(?P<modifier>
|
||||
|
|
@ -163,7 +164,7 @@ $
|
|||
self.linux_upstream = u'-'.join((d['version'], d['modifier']))
|
||||
else:
|
||||
self.linux_upstream = d['version']
|
||||
self.linux_upstream_full = self.linux_upstream + (d['update'] or u'')
|
||||
self.linux_upstream_full = self.linux_upstream + d['update']
|
||||
self.linux_dfsg = d['dfsg']
|
||||
self.linux_revision_experimental = match.group('revision_experimental') and True
|
||||
self.linux_revision_backports = match.group('revision_backports') and True
|
||||
|
|
|
|||
|
|
@ -0,0 +1,214 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Thu, 30 Oct 2014 18:27:12 +0000
|
||||
Subject: [1/2] drivers/net: Disable UFO through virtio
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit?id=3d0ad09412ffe00c9afa201d01effdb6023d09b4
|
||||
|
||||
IPv6 does not allow fragmentation by routers, so there is no
|
||||
fragmentation ID in the fixed header. UFO for IPv6 requires the ID to
|
||||
be passed separately, but there is no provision for this in the virtio
|
||||
net protocol.
|
||||
|
||||
Until recently our software implementation of UFO/IPv6 generated a new
|
||||
ID, but this was a bug. Now we will use ID=0 for any UFO/IPv6 packet
|
||||
passed through a tap, which is even worse.
|
||||
|
||||
Unfortunately there is no distinction between UFO/IPv4 and v6
|
||||
features, so disable UFO on taps and virtio_net completely until we
|
||||
have a proper solution.
|
||||
|
||||
We cannot depend on VM managers respecting the tap feature flags, so
|
||||
keep accepting UFO packets but log a warning the first time we do
|
||||
this.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
Fixes: 916e4cf46d02 ("ipv6: reuse ip6_frag_id from ip6_ufo_append_data")
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/macvtap.c | 13 +++++--------
|
||||
drivers/net/tun.c | 19 +++++++++++--------
|
||||
drivers/net/virtio_net.c | 24 ++++++++++++++----------
|
||||
3 files changed, 30 insertions(+), 26 deletions(-)
|
||||
|
||||
--- a/drivers/net/macvtap.c
|
||||
+++ b/drivers/net/macvtap.c
|
||||
@@ -66,7 +66,7 @@ static struct cdev macvtap_cdev;
|
||||
static const struct proto_ops macvtap_socket_ops;
|
||||
|
||||
#define TUN_OFFLOADS (NETIF_F_HW_CSUM | NETIF_F_TSO_ECN | NETIF_F_TSO | \
|
||||
- NETIF_F_TSO6 | NETIF_F_UFO)
|
||||
+ NETIF_F_TSO6)
|
||||
#define RX_OFFLOADS (NETIF_F_GRO | NETIF_F_LRO)
|
||||
#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG)
|
||||
|
||||
@@ -570,6 +570,8 @@ static int macvtap_skb_from_vnet_hdr(str
|
||||
gso_type = SKB_GSO_TCPV6;
|
||||
break;
|
||||
case VIRTIO_NET_HDR_GSO_UDP:
|
||||
+ pr_warn_once("macvtap: %s: using disabled UFO feature; please fix this program\n",
|
||||
+ current->comm);
|
||||
gso_type = SKB_GSO_UDP;
|
||||
if (skb->protocol == htons(ETH_P_IPV6))
|
||||
ipv6_proxy_select_ident(skb);
|
||||
@@ -617,8 +619,6 @@ static void macvtap_skb_to_vnet_hdr(cons
|
||||
vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
|
||||
else if (sinfo->gso_type & SKB_GSO_TCPV6)
|
||||
vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
|
||||
- else if (sinfo->gso_type & SKB_GSO_UDP)
|
||||
- vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_UDP;
|
||||
else
|
||||
BUG();
|
||||
if (sinfo->gso_type & SKB_GSO_TCP_ECN)
|
||||
@@ -955,9 +955,6 @@ static int set_offload(struct macvtap_qu
|
||||
if (arg & TUN_F_TSO6)
|
||||
feature_mask |= NETIF_F_TSO6;
|
||||
}
|
||||
-
|
||||
- if (arg & TUN_F_UFO)
|
||||
- feature_mask |= NETIF_F_UFO;
|
||||
}
|
||||
|
||||
/* tun/tap driver inverts the usage for TSO offloads, where
|
||||
@@ -968,7 +965,7 @@ static int set_offload(struct macvtap_qu
|
||||
* When user space turns off TSO, we turn off GSO/LRO so that
|
||||
* user-space will not receive TSO frames.
|
||||
*/
|
||||
- if (feature_mask & (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_UFO))
|
||||
+ if (feature_mask & (NETIF_F_TSO | NETIF_F_TSO6))
|
||||
features |= RX_OFFLOADS;
|
||||
else
|
||||
features &= ~RX_OFFLOADS;
|
||||
@@ -1069,7 +1066,7 @@ static long macvtap_ioctl(struct file *f
|
||||
case TUNSETOFFLOAD:
|
||||
/* let the user check for future flags */
|
||||
if (arg & ~(TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 |
|
||||
- TUN_F_TSO_ECN | TUN_F_UFO))
|
||||
+ TUN_F_TSO_ECN))
|
||||
return -EINVAL;
|
||||
|
||||
rtnl_lock();
|
||||
--- a/drivers/net/tun.c
|
||||
+++ b/drivers/net/tun.c
|
||||
@@ -175,7 +175,7 @@ struct tun_struct {
|
||||
struct net_device *dev;
|
||||
netdev_features_t set_features;
|
||||
#define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \
|
||||
- NETIF_F_TSO6|NETIF_F_UFO)
|
||||
+ NETIF_F_TSO6)
|
||||
|
||||
int vnet_hdr_sz;
|
||||
int sndbuf;
|
||||
@@ -1152,10 +1152,20 @@ static ssize_t tun_get_user(struct tun_s
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
|
||||
break;
|
||||
case VIRTIO_NET_HDR_GSO_UDP:
|
||||
+ {
|
||||
+ static bool warned;
|
||||
+
|
||||
+ if (!warned) {
|
||||
+ warned = true;
|
||||
+ netdev_warn(tun->dev,
|
||||
+ "%s: using disabled UFO feature; please fix this program\n",
|
||||
+ current->comm);
|
||||
+ }
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
|
||||
if (skb->protocol == htons(ETH_P_IPV6))
|
||||
ipv6_proxy_select_ident(skb);
|
||||
break;
|
||||
+ }
|
||||
default:
|
||||
tun->dev->stats.rx_frame_errors++;
|
||||
kfree_skb(skb);
|
||||
@@ -1259,8 +1269,6 @@ static ssize_t tun_put_user(struct tun_s
|
||||
gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
|
||||
else if (sinfo->gso_type & SKB_GSO_TCPV6)
|
||||
gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
|
||||
- else if (sinfo->gso_type & SKB_GSO_UDP)
|
||||
- gso.gso_type = VIRTIO_NET_HDR_GSO_UDP;
|
||||
else {
|
||||
pr_err("unexpected GSO type: "
|
||||
"0x%x, gso_size %d, hdr_len %d\n",
|
||||
@@ -1768,11 +1776,6 @@ static int set_offload(struct tun_struct
|
||||
features |= NETIF_F_TSO6;
|
||||
arg &= ~(TUN_F_TSO4|TUN_F_TSO6);
|
||||
}
|
||||
-
|
||||
- if (arg & TUN_F_UFO) {
|
||||
- features |= NETIF_F_UFO;
|
||||
- arg &= ~TUN_F_UFO;
|
||||
- }
|
||||
}
|
||||
|
||||
/* This gives the user a way to test for new features in future by
|
||||
--- a/drivers/net/virtio_net.c
|
||||
+++ b/drivers/net/virtio_net.c
|
||||
@@ -497,8 +497,17 @@ static void receive_buf(struct receive_q
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
|
||||
break;
|
||||
case VIRTIO_NET_HDR_GSO_UDP:
|
||||
+ {
|
||||
+ static bool warned;
|
||||
+
|
||||
+ if (!warned) {
|
||||
+ warned = true;
|
||||
+ netdev_warn(dev,
|
||||
+ "host using disabled UFO feature; please fix it\n");
|
||||
+ }
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
|
||||
break;
|
||||
+ }
|
||||
case VIRTIO_NET_HDR_GSO_TCPV6:
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
|
||||
break;
|
||||
@@ -885,8 +894,6 @@ static int xmit_skb(struct send_queue *s
|
||||
hdr->hdr.gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
|
||||
else if (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6)
|
||||
hdr->hdr.gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
|
||||
- else if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP)
|
||||
- hdr->hdr.gso_type = VIRTIO_NET_HDR_GSO_UDP;
|
||||
else
|
||||
BUG();
|
||||
if (skb_shinfo(skb)->gso_type & SKB_GSO_TCP_ECN)
|
||||
@@ -1710,7 +1717,7 @@ static int virtnet_probe(struct virtio_d
|
||||
dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
|
||||
|
||||
if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
|
||||
- dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO
|
||||
+ dev->hw_features |= NETIF_F_TSO
|
||||
| NETIF_F_TSO_ECN | NETIF_F_TSO6;
|
||||
}
|
||||
/* Individual feature bits: what can host handle? */
|
||||
@@ -1720,11 +1727,9 @@ static int virtnet_probe(struct virtio_d
|
||||
dev->hw_features |= NETIF_F_TSO6;
|
||||
if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_ECN))
|
||||
dev->hw_features |= NETIF_F_TSO_ECN;
|
||||
- if (virtio_has_feature(vdev, VIRTIO_NET_F_HOST_UFO))
|
||||
- dev->hw_features |= NETIF_F_UFO;
|
||||
|
||||
if (gso)
|
||||
- dev->features |= dev->hw_features & (NETIF_F_ALL_TSO|NETIF_F_UFO);
|
||||
+ dev->features |= dev->hw_features & NETIF_F_ALL_TSO;
|
||||
/* (!csum && gso) case will be fixed by register_netdev() */
|
||||
}
|
||||
if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_CSUM))
|
||||
@@ -1764,8 +1769,7 @@ static int virtnet_probe(struct virtio_d
|
||||
/* If we can receive ANY GSO packets, we must allocate large ones. */
|
||||
if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||
|
||||
virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO6) ||
|
||||
- virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_ECN) ||
|
||||
- virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_UFO))
|
||||
+ virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_ECN))
|
||||
vi->big_packets = true;
|
||||
|
||||
if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF))
|
||||
@@ -1965,9 +1969,9 @@ static struct virtio_device_id id_table[
|
||||
static unsigned int features[] = {
|
||||
VIRTIO_NET_F_CSUM, VIRTIO_NET_F_GUEST_CSUM,
|
||||
VIRTIO_NET_F_GSO, VIRTIO_NET_F_MAC,
|
||||
- VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_UFO, VIRTIO_NET_F_HOST_TSO6,
|
||||
+ VIRTIO_NET_F_HOST_TSO4, VIRTIO_NET_F_HOST_TSO6,
|
||||
VIRTIO_NET_F_HOST_ECN, VIRTIO_NET_F_GUEST_TSO4, VIRTIO_NET_F_GUEST_TSO6,
|
||||
- VIRTIO_NET_F_GUEST_ECN, VIRTIO_NET_F_GUEST_UFO,
|
||||
+ VIRTIO_NET_F_GUEST_ECN,
|
||||
VIRTIO_NET_F_MRG_RXBUF, VIRTIO_NET_F_STATUS, VIRTIO_NET_F_CTRL_VQ,
|
||||
VIRTIO_NET_F_CTRL_RX, VIRTIO_NET_F_CTRL_VLAN,
|
||||
VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ,
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||||
Date: Mon, 29 Sep 2014 11:47:53 +0200
|
||||
Subject: [2/4] mtd: m25p80: get rid of spi_get_device_id
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Origin: http://git.infradead.org/l2-mtd.git/commit/90e55b3812a1245bb674afcc4410ddba7db402f6
|
||||
|
||||
This simplifies the way we use spi_nor framework and will allow us to
|
||||
drop spi_nor_match_id.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
||||
---
|
||||
drivers/mtd/devices/m25p80.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
|
||||
index dcda628..822209d 100644
|
||||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -197,6 +197,7 @@ static int m25p_probe(struct spi_device *spi)
|
||||
struct m25p *flash;
|
||||
struct spi_nor *nor;
|
||||
enum read_mode mode = SPI_NOR_NORMAL;
|
||||
+ char *flash_name = NULL;
|
||||
int ret;
|
||||
|
||||
data = dev_get_platdata(&spi->dev);
|
||||
@@ -236,12 +237,11 @@ static int m25p_probe(struct spi_device *spi)
|
||||
* If that's the case, respect "type" and ignore a "name".
|
||||
*/
|
||||
if (data && data->type)
|
||||
- id = spi_nor_match_id(data->type);
|
||||
-
|
||||
- /* If we didn't get name from platform, simply use "modalias". */
|
||||
- if (!id)
|
||||
- id = spi_get_device_id(spi);
|
||||
+ flash_name = data->type;
|
||||
+ else
|
||||
+ flash_name = spi->modalias;
|
||||
|
||||
+ id = spi_nor_match_id(flash_name);
|
||||
ret = spi_nor_scan(nor, id, mode);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
@ -1,119 +0,0 @@
|
|||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||||
Date: Sun, 28 Sep 2014 22:36:54 +0200
|
||||
Subject: [1/4] mtd: move support for struct flash_platform_data into m25p80
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Origin: http://git.infradead.org/l2-mtd.git/commit/32f1b7c8352fd33d41bcec3cfb054ccdcfd40a42
|
||||
|
||||
This "type" seems to be an extra hint for m25p80 about the flash. Some
|
||||
archs register flash_platform_data with "name" set to "m25p80" and then
|
||||
with a real flash name set in "type". It seems to be a trick specific
|
||||
to the m25p80 so let's move it out of spi-nor.
|
||||
Btw switch to the spi_nor_match_id instead of iterating spi_nor_ids.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
||||
---
|
||||
drivers/mtd/devices/m25p80.c | 22 ++++++++++++++++++++--
|
||||
drivers/mtd/spi-nor/spi-nor.c | 28 +---------------------------
|
||||
2 files changed, 21 insertions(+), 29 deletions(-)
|
||||
|
||||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -193,11 +193,14 @@ static int m25p_probe(struct spi_device
|
||||
{
|
||||
struct mtd_part_parser_data ppdata;
|
||||
struct flash_platform_data *data;
|
||||
+ const struct spi_device_id *id = NULL;
|
||||
struct m25p *flash;
|
||||
struct spi_nor *nor;
|
||||
enum read_mode mode = SPI_NOR_NORMAL;
|
||||
int ret;
|
||||
|
||||
+ data = dev_get_platdata(&spi->dev);
|
||||
+
|
||||
flash = devm_kzalloc(&spi->dev, sizeof(*flash), GFP_KERNEL);
|
||||
if (!flash)
|
||||
return -ENOMEM;
|
||||
@@ -223,11 +226,26 @@ static int m25p_probe(struct spi_device
|
||||
mode = SPI_NOR_QUAD;
|
||||
else if (spi->mode & SPI_RX_DUAL)
|
||||
mode = SPI_NOR_DUAL;
|
||||
- ret = spi_nor_scan(nor, spi_get_device_id(spi), mode);
|
||||
+
|
||||
+ if (data && data->name)
|
||||
+ flash->mtd.name = data->name;
|
||||
+
|
||||
+ /* For some (historical?) reason many platforms provide two different
|
||||
+ * names in flash_platform_data: "name" and "type". Quite often name is
|
||||
+ * set to "m25p80" and then "type" provides a real chip name.
|
||||
+ * If that's the case, respect "type" and ignore a "name".
|
||||
+ */
|
||||
+ if (data && data->type)
|
||||
+ id = spi_nor_match_id(data->type);
|
||||
+
|
||||
+ /* If we didn't get name from platform, simply use "modalias". */
|
||||
+ if (!id)
|
||||
+ id = spi_get_device_id(spi);
|
||||
+
|
||||
+ ret = spi_nor_scan(nor, id, mode);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
- data = dev_get_platdata(&spi->dev);
|
||||
ppdata.of_node = spi->dev.of_node;
|
||||
|
||||
return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -871,7 +871,6 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
enum read_mode mode)
|
||||
{
|
||||
struct flash_info *info;
|
||||
- struct flash_platform_data *data;
|
||||
struct device *dev = nor->dev;
|
||||
struct mtd_info *mtd = nor->mtd;
|
||||
struct device_node *np = dev->of_node;
|
||||
@@ -882,28 +881,6 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
- /* Platform data helps sort out which chip type we have, as
|
||||
- * well as how this board partitions it. If we don't have
|
||||
- * a chip ID, try the JEDEC id commands; they'll work for most
|
||||
- * newer chips, even if we don't recognize the particular chip.
|
||||
- */
|
||||
- data = dev_get_platdata(dev);
|
||||
- if (data && data->type) {
|
||||
- const struct spi_device_id *plat_id;
|
||||
-
|
||||
- for (i = 0; i < ARRAY_SIZE(spi_nor_ids) - 1; i++) {
|
||||
- plat_id = &spi_nor_ids[i];
|
||||
- if (strcmp(data->type, plat_id->name))
|
||||
- continue;
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- if (i < ARRAY_SIZE(spi_nor_ids) - 1)
|
||||
- id = plat_id;
|
||||
- else
|
||||
- dev_warn(dev, "unrecognized id %s\n", data->type);
|
||||
- }
|
||||
-
|
||||
info = (void *)id->driver_data;
|
||||
|
||||
if (info->jedec_id) {
|
||||
@@ -941,11 +918,8 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
write_sr(nor, 0);
|
||||
}
|
||||
|
||||
- if (data && data->name)
|
||||
- mtd->name = data->name;
|
||||
- else
|
||||
+ if (!mtd->name)
|
||||
mtd->name = dev_name(dev);
|
||||
-
|
||||
mtd->type = MTD_NORFLASH;
|
||||
mtd->writesize = 1;
|
||||
mtd->flags = MTD_CAP_NORFLASH;
|
||||
|
|
@ -1,162 +0,0 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Mon, 29 Sep 2014 11:47:54 +0200
|
||||
Subject: [3/4] mtd: spi-nor: make spi_nor_scan() take a chip type name, not
|
||||
spi_device_id
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Origin: http://git.infradead.org/l2-mtd.git/commit/70f3ce0510afdad7cbaf27ab7ab961377205c782
|
||||
|
||||
Drivers currently call spi_nor_match_id() and then spi_nor_scan().
|
||||
This adds a dependency on struct spi_device_id which we want to
|
||||
avoid. Make spi_nor_scan() do it for them.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
||||
---
|
||||
drivers/mtd/devices/m25p80.c | 4 +---
|
||||
drivers/mtd/spi-nor/fsl-quadspi.c | 7 +------
|
||||
drivers/mtd/spi-nor/spi-nor.c | 13 +++++++++----
|
||||
include/linux/mtd/spi-nor.h | 20 +++-----------------
|
||||
4 files changed, 14 insertions(+), 30 deletions(-)
|
||||
|
||||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -193,7 +193,6 @@ static int m25p_probe(struct spi_device
|
||||
{
|
||||
struct mtd_part_parser_data ppdata;
|
||||
struct flash_platform_data *data;
|
||||
- const struct spi_device_id *id = NULL;
|
||||
struct m25p *flash;
|
||||
struct spi_nor *nor;
|
||||
enum read_mode mode = SPI_NOR_NORMAL;
|
||||
@@ -241,8 +240,7 @@ static int m25p_probe(struct spi_device
|
||||
else
|
||||
flash_name = spi->modalias;
|
||||
|
||||
- id = spi_nor_match_id(flash_name);
|
||||
- ret = spi_nor_scan(nor, id, mode);
|
||||
+ ret = spi_nor_scan(nor, flash_name, mode);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
|
||||
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
|
||||
@@ -881,7 +881,6 @@ static int fsl_qspi_probe(struct platfor
|
||||
|
||||
/* iterate the subnodes. */
|
||||
for_each_available_child_of_node(dev->of_node, np) {
|
||||
- const struct spi_device_id *id;
|
||||
char modalias[40];
|
||||
|
||||
/* skip the holes */
|
||||
@@ -909,10 +908,6 @@ static int fsl_qspi_probe(struct platfor
|
||||
if (of_modalias_node(np, modalias, sizeof(modalias)) < 0)
|
||||
goto map_failed;
|
||||
|
||||
- id = spi_nor_match_id(modalias);
|
||||
- if (!id)
|
||||
- goto map_failed;
|
||||
-
|
||||
ret = of_property_read_u32(np, "spi-max-frequency",
|
||||
&q->clk_rate);
|
||||
if (ret < 0)
|
||||
@@ -921,7 +916,7 @@ static int fsl_qspi_probe(struct platfor
|
||||
/* set the chip address for READID */
|
||||
fsl_qspi_set_base_addr(q, nor);
|
||||
|
||||
- ret = spi_nor_scan(nor, id, SPI_NOR_QUAD);
|
||||
+ ret = spi_nor_scan(nor, modalias, SPI_NOR_QUAD);
|
||||
if (ret)
|
||||
goto map_failed;
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -28,6 +28,8 @@
|
||||
|
||||
#define JEDEC_MFR(_jedec_id) ((_jedec_id) >> 16)
|
||||
|
||||
+static const struct spi_device_id *spi_nor_match_id(const char *name);
|
||||
+
|
||||
/*
|
||||
* Read the status register, returning its value in the location
|
||||
* Return the status register value.
|
||||
@@ -867,9 +869,9 @@ static int spi_nor_check(struct spi_nor
|
||||
return 0;
|
||||
}
|
||||
|
||||
-int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,
|
||||
- enum read_mode mode)
|
||||
+int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
|
||||
{
|
||||
+ const struct spi_device_id *id = NULL;
|
||||
struct flash_info *info;
|
||||
struct device *dev = nor->dev;
|
||||
struct mtd_info *mtd = nor->mtd;
|
||||
@@ -881,6 +883,10 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
+ id = spi_nor_match_id(name);
|
||||
+ if (!id)
|
||||
+ return -ENOENT;
|
||||
+
|
||||
info = (void *)id->driver_data;
|
||||
|
||||
if (info->jedec_id) {
|
||||
@@ -1062,7 +1068,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(spi_nor_scan);
|
||||
|
||||
-const struct spi_device_id *spi_nor_match_id(char *name)
|
||||
+static const struct spi_device_id *spi_nor_match_id(const char *name)
|
||||
{
|
||||
const struct spi_device_id *id = spi_nor_ids;
|
||||
|
||||
@@ -1073,7 +1079,6 @@ const struct spi_device_id *spi_nor_matc
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
-EXPORT_SYMBOL_GPL(spi_nor_match_id);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Huang Shijie <shijie8@gmail.com>");
|
||||
--- a/include/linux/mtd/spi-nor.h
|
||||
+++ b/include/linux/mtd/spi-nor.h
|
||||
@@ -183,32 +183,18 @@ struct spi_nor {
|
||||
/**
|
||||
* spi_nor_scan() - scan the SPI NOR
|
||||
* @nor: the spi_nor structure
|
||||
- * @id: the spi_device_id provided by the driver
|
||||
+ * @name: the chip type name
|
||||
* @mode: the read mode supported by the driver
|
||||
*
|
||||
* The drivers can use this fuction to scan the SPI NOR.
|
||||
* In the scanning, it will try to get all the necessary information to
|
||||
* fill the mtd_info{} and the spi_nor{}.
|
||||
*
|
||||
- * The board may assigns a spi_device_id with @id which be used to compared with
|
||||
- * the spi_device_id detected by the scanning.
|
||||
+ * The chip type name can be provided through the @name parameter.
|
||||
*
|
||||
* Return: 0 for success, others for failure.
|
||||
*/
|
||||
-int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,
|
||||
- enum read_mode mode);
|
||||
+int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode);
|
||||
extern const struct spi_device_id spi_nor_ids[];
|
||||
|
||||
-/**
|
||||
- * spi_nor_match_id() - find the spi_device_id by the name
|
||||
- * @name: the name of the spi_device_id
|
||||
- *
|
||||
- * The drivers use this function to find the spi_device_id
|
||||
- * specified by the @name.
|
||||
- *
|
||||
- * Return: returns the right spi_device_id pointer on success,
|
||||
- * and returns NULL on failure.
|
||||
- */
|
||||
-const struct spi_device_id *spi_nor_match_id(char *name);
|
||||
-
|
||||
#endif
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
Subject: [1/1] net: mv643xx_eth: Make TSO disabled by default
|
||||
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
||||
Date: Sat, 1 Nov 2014 12:30:20 -0300
|
||||
Origin: http://patchwork.ozlabs.org/patch/405792/
|
||||
|
||||
Data corruption has been observed to be produced by TSO. For instance,
|
||||
accessing files on a NFS-server with TSO enabled results in different data
|
||||
transferred each time.
|
||||
|
||||
This has been observed only on Kirkwood platforms, i.e. with the mv643xx_eth
|
||||
driver. Same tests on platforms using the mvneta ethernet driver have
|
||||
passed without errors.
|
||||
|
||||
Make TSO disabled by default for now, until we can found a proper fix
|
||||
for the regression.
|
||||
|
||||
Fixes: 3ae8f4e0b98 ('net: mv643xx_eth: Implement software TSO')
|
||||
Reported-by: Slawomir Gajzner <slawomir.gajzner@gmail.com>
|
||||
Reported-by: Julien D'Ascenzio <jdascenzio@yahoo.fr>
|
||||
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
||||
---
|
||||
drivers/net/ethernet/marvell/mv643xx_eth.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
|
||||
index b151a94..8b72780 100644
|
||||
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
|
||||
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
|
||||
@@ -3110,11 +3110,11 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
|
||||
dev->watchdog_timeo = 2 * HZ;
|
||||
dev->base_addr = 0;
|
||||
|
||||
- dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
|
||||
+ dev->features = NETIF_F_SG | NETIF_F_IP_CSUM;
|
||||
dev->vlan_features = dev->features;
|
||||
|
||||
dev->features |= NETIF_F_RXCSUM;
|
||||
- dev->hw_features = dev->features;
|
||||
+ dev->hw_features = dev->features | NETIF_F_TSO;
|
||||
|
||||
dev->priv_flags |= IFF_UNICAST_FLT;
|
||||
dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;
|
||||
53
debian/patches/bugfix/all/of-fdt-memblock_reserve-memreserve-regions-in-the-ca.patch
vendored
Normal file
53
debian/patches/bugfix/all/of-fdt-memblock_reserve-memreserve-regions-in-the-ca.patch
vendored
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
From a636289fb6037392c3551aeed1033576c3aef426 Mon Sep 17 00:00:00 2001
|
||||
From: Ian Campbell <ian.campbell@citrix.com>
|
||||
Date: Tue, 25 Nov 2014 15:05:13 +0000
|
||||
Subject: [PATCH] of/fdt: memblock_reserve /memreserve/ regions in the case of
|
||||
partial overlap
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/glikely/linux.git/commit/?h=devicetree/merge&id=094cb98179f19b75acf9ff471daabf3948ce98e6
|
||||
|
||||
memblock_is_region_reserved() returns true in the case of a partial
|
||||
overlap, meaning that the current code fails to reserve the
|
||||
non-overlapping portion.
|
||||
|
||||
This call was introduced as part of d1552ce449eb "of/fdt: move
|
||||
memreserve and dtb memory reservations into core" which went into
|
||||
v3.16.
|
||||
|
||||
I observed this causing a Midway system with a buggy fdt (the header
|
||||
declares itself to be larger than it really is) failing to boot
|
||||
because the over-inflated size of the fdt was causing it to seem to
|
||||
run into the swapper_pg_dir region, meaning the DT wasn't reserved.
|
||||
The symptoms were failing to find an disks or network and failing to
|
||||
boot.
|
||||
|
||||
However given the ambiguity of whether things like the initrd are
|
||||
covered by /memreserve/ and similar I think it is best to also
|
||||
register the region rather than just ignoring it.
|
||||
|
||||
Since memblock_reserve() handles overlaps just fine lets just warn and
|
||||
carry on.
|
||||
|
||||
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
|
||||
Signed-off-by: Grant Likely <grant.likely@linaro.org>
|
||||
Cc: Rob Herring <robh+dt@kernel.org>
|
||||
Cc: stable@vger.kernel.org # v3.16+
|
||||
---
|
||||
drivers/of/fdt.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
|
||||
index 379ad4f..94a8511 100644
|
||||
--- a/drivers/of/fdt.c
|
||||
+++ b/drivers/of/fdt.c
|
||||
@@ -960,8 +960,6 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
|
||||
int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,
|
||||
phys_addr_t size, bool nomap)
|
||||
{
|
||||
- if (memblock_is_region_reserved(base, size))
|
||||
- return -EBUSY;
|
||||
if (nomap)
|
||||
return memblock_remove(base, size);
|
||||
return memblock_reserve(base, size);
|
||||
--
|
||||
2.1.3
|
||||
|
||||
129
debian/patches/bugfix/all/revert-drivers-net-disable-ufo-through-virtio-in-macvtap-and-tun.patch
vendored
Normal file
129
debian/patches/bugfix/all/revert-drivers-net-disable-ufo-through-virtio-in-macvtap-and-tun.patch
vendored
Normal file
|
|
@ -0,0 +1,129 @@
|
|||
Subject: Revert "drivers/net: Disable UFO through virtio" in macvtap and tun
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Tue, 11 Nov 2014 17:12:58 +0000
|
||||
|
||||
This reverts commit 88e0e0e5aa722b193c8758c8b45d041de5316924 for
|
||||
the tap drivers, but leaves UFO disabled in virtio_net.
|
||||
|
||||
libvirt at least assumes that tap features will never be dropped
|
||||
in new kernel versions, and doing so prevents migration of VMs to
|
||||
the never kernel version while they are running with virtio net
|
||||
devices.
|
||||
|
||||
Fixes: 88e0e0e5aa7a ("drivers/net: Disable UFO through virtio")
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
drivers/net/macvtap.c | 13 ++++++++-----
|
||||
drivers/net/tun.c | 19 ++++++++-----------
|
||||
2 files changed, 16 insertions(+), 16 deletions(-)
|
||||
|
||||
--- a/drivers/net/macvtap.c
|
||||
+++ b/drivers/net/macvtap.c
|
||||
@@ -66,7 +66,7 @@ static struct cdev macvtap_cdev;
|
||||
static const struct proto_ops macvtap_socket_ops;
|
||||
|
||||
#define TUN_OFFLOADS (NETIF_F_HW_CSUM | NETIF_F_TSO_ECN | NETIF_F_TSO | \
|
||||
- NETIF_F_TSO6)
|
||||
+ NETIF_F_TSO6 | NETIF_F_UFO)
|
||||
#define RX_OFFLOADS (NETIF_F_GRO | NETIF_F_LRO)
|
||||
#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG)
|
||||
|
||||
@@ -570,8 +570,6 @@ static int macvtap_skb_from_vnet_hdr(str
|
||||
gso_type = SKB_GSO_TCPV6;
|
||||
break;
|
||||
case VIRTIO_NET_HDR_GSO_UDP:
|
||||
- pr_warn_once("macvtap: %s: using disabled UFO feature; please fix this program\n",
|
||||
- current->comm);
|
||||
gso_type = SKB_GSO_UDP;
|
||||
if (skb->protocol == htons(ETH_P_IPV6))
|
||||
ipv6_proxy_select_ident(skb);
|
||||
@@ -619,6 +617,8 @@ static void macvtap_skb_to_vnet_hdr(cons
|
||||
vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
|
||||
else if (sinfo->gso_type & SKB_GSO_TCPV6)
|
||||
vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
|
||||
+ else if (sinfo->gso_type & SKB_GSO_UDP)
|
||||
+ vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_UDP;
|
||||
else
|
||||
BUG();
|
||||
if (sinfo->gso_type & SKB_GSO_TCP_ECN)
|
||||
@@ -955,6 +955,9 @@ static int set_offload(struct macvtap_qu
|
||||
if (arg & TUN_F_TSO6)
|
||||
feature_mask |= NETIF_F_TSO6;
|
||||
}
|
||||
+
|
||||
+ if (arg & TUN_F_UFO)
|
||||
+ feature_mask |= NETIF_F_UFO;
|
||||
}
|
||||
|
||||
/* tun/tap driver inverts the usage for TSO offloads, where
|
||||
@@ -965,7 +968,7 @@ static int set_offload(struct macvtap_qu
|
||||
* When user space turns off TSO, we turn off GSO/LRO so that
|
||||
* user-space will not receive TSO frames.
|
||||
*/
|
||||
- if (feature_mask & (NETIF_F_TSO | NETIF_F_TSO6))
|
||||
+ if (feature_mask & (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_UFO))
|
||||
features |= RX_OFFLOADS;
|
||||
else
|
||||
features &= ~RX_OFFLOADS;
|
||||
@@ -1066,7 +1069,7 @@ static long macvtap_ioctl(struct file *f
|
||||
case TUNSETOFFLOAD:
|
||||
/* let the user check for future flags */
|
||||
if (arg & ~(TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 |
|
||||
- TUN_F_TSO_ECN))
|
||||
+ TUN_F_TSO_ECN | TUN_F_UFO))
|
||||
return -EINVAL;
|
||||
|
||||
rtnl_lock();
|
||||
--- a/drivers/net/tun.c
|
||||
+++ b/drivers/net/tun.c
|
||||
@@ -175,7 +175,7 @@ struct tun_struct {
|
||||
struct net_device *dev;
|
||||
netdev_features_t set_features;
|
||||
#define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \
|
||||
- NETIF_F_TSO6)
|
||||
+ NETIF_F_TSO6|NETIF_F_UFO)
|
||||
|
||||
int vnet_hdr_sz;
|
||||
int sndbuf;
|
||||
@@ -1152,20 +1152,10 @@ static ssize_t tun_get_user(struct tun_s
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
|
||||
break;
|
||||
case VIRTIO_NET_HDR_GSO_UDP:
|
||||
- {
|
||||
- static bool warned;
|
||||
-
|
||||
- if (!warned) {
|
||||
- warned = true;
|
||||
- netdev_warn(tun->dev,
|
||||
- "%s: using disabled UFO feature; please fix this program\n",
|
||||
- current->comm);
|
||||
- }
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
|
||||
if (skb->protocol == htons(ETH_P_IPV6))
|
||||
ipv6_proxy_select_ident(skb);
|
||||
break;
|
||||
- }
|
||||
default:
|
||||
tun->dev->stats.rx_frame_errors++;
|
||||
kfree_skb(skb);
|
||||
@@ -1269,6 +1259,8 @@ static ssize_t tun_put_user(struct tun_s
|
||||
gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
|
||||
else if (sinfo->gso_type & SKB_GSO_TCPV6)
|
||||
gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
|
||||
+ else if (sinfo->gso_type & SKB_GSO_UDP)
|
||||
+ gso.gso_type = VIRTIO_NET_HDR_GSO_UDP;
|
||||
else {
|
||||
pr_err("unexpected GSO type: "
|
||||
"0x%x, gso_size %d, hdr_len %d\n",
|
||||
@@ -1775,6 +1767,11 @@ static int set_offload(struct tun_struct
|
||||
features |= NETIF_F_TSO6;
|
||||
arg &= ~(TUN_F_TSO4|TUN_F_TSO6);
|
||||
}
|
||||
+
|
||||
+ if (arg & TUN_F_UFO) {
|
||||
+ features |= NETIF_F_UFO;
|
||||
+ arg &= ~TUN_F_UFO;
|
||||
+ }
|
||||
}
|
||||
|
||||
/* This gives the user a way to test for new features in future by
|
||||
614
debian/patches/bugfix/all/xen-netback-fix-unlimited-guest-Rx-internal-queue-an.patch
vendored
Normal file
614
debian/patches/bugfix/all/xen-netback-fix-unlimited-guest-Rx-internal-queue-an.patch
vendored
Normal file
|
|
@ -0,0 +1,614 @@
|
|||
From 8a73fe2999810038cde046462258a3cd5afe170e Mon Sep 17 00:00:00 2001
|
||||
From: David Vrabel <david.vrabel@citrix.com>
|
||||
Date: Wed, 22 Oct 2014 14:08:54 +0100
|
||||
Subject: [PATCH 13/14] xen-netback: fix unlimited guest Rx internal queue and
|
||||
carrier flapping
|
||||
Origin: https://git.kernel.org/linus/f48da8b14d04ca87ffcffe68829afd45f926ec6a
|
||||
|
||||
Netback needs to discard old to-guest skb's (guest Rx queue drain) and
|
||||
it needs detect guest Rx stalls (to disable the carrier so packets are
|
||||
discarded earlier), but the current implementation is very broken.
|
||||
|
||||
1. The check in hard_start_xmit of the slot availability did not
|
||||
consider the number of packets that were already in the guest Rx
|
||||
queue. This could allow the queue to grow without bound.
|
||||
|
||||
The guest stops consuming packets and the ring was allowed to fill
|
||||
leaving S slot free. Netback queues a packet requiring more than S
|
||||
slots (ensuring that the ring stays with S slots free). Netback
|
||||
queue indefinately packets provided that then require S or fewer
|
||||
slots.
|
||||
|
||||
2. The Rx stall detection is not triggered in this case since the
|
||||
(host) Tx queue is not stopped.
|
||||
|
||||
3. If the Tx queue is stopped and a guest Rx interrupt occurs, netback
|
||||
will consider this an Rx purge event which may result in it taking
|
||||
the carrier down unnecessarily. It also considers a queue with
|
||||
only 1 slot free as unstalled (even though the next packet might
|
||||
not fit in this).
|
||||
|
||||
The internal guest Rx queue is limited by a byte length (to 512 Kib,
|
||||
enough for half the ring). The (host) Tx queue is stopped and started
|
||||
based on this limit. This sets an upper bound on the amount of memory
|
||||
used by packets on the internal queue.
|
||||
|
||||
This allows the estimatation of the number of slots for an skb to be
|
||||
removed (it wasn't a very good estimate anyway). Instead, the guest
|
||||
Rx thread just waits for enough free slots for a maximum sized packet.
|
||||
|
||||
skbs queued on the internal queue have an 'expires' time (set to the
|
||||
current time plus the drain timeout). The guest Rx thread will detect
|
||||
when the skb at the head of the queue has expired and discard expired
|
||||
skbs. This sets a clear upper bound on the length of time an skb can
|
||||
be queued for. For a guest being destroyed the maximum time needed to
|
||||
wait for all the packets it sent to be dropped is still the drain
|
||||
timeout (10 s) since it will not be sending new packets.
|
||||
|
||||
Rx stall detection is reintroduced in a later commit.
|
||||
|
||||
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
|
||||
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
(cherry picked from commit f48da8b14d04ca87ffcffe68829afd45f926ec6a)
|
||||
---
|
||||
drivers/net/xen-netback/common.h | 29 +++--
|
||||
drivers/net/xen-netback/interface.c | 59 ++-------
|
||||
drivers/net/xen-netback/netback.c | 243 ++++++++++++++++++-----------------
|
||||
drivers/net/xen-netback/xenbus.c | 8 ++
|
||||
4 files changed, 161 insertions(+), 178 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
|
||||
index 93ca77c..c264240 100644
|
||||
--- a/drivers/net/xen-netback/common.h
|
||||
+++ b/drivers/net/xen-netback/common.h
|
||||
@@ -176,10 +176,9 @@ struct xenvif_queue { /* Per-queue data for xenvif */
|
||||
char rx_irq_name[IRQ_NAME_SIZE]; /* DEVNAME-qN-rx */
|
||||
struct xen_netif_rx_back_ring rx;
|
||||
struct sk_buff_head rx_queue;
|
||||
- RING_IDX rx_last_skb_slots;
|
||||
- unsigned long status;
|
||||
|
||||
- struct timer_list rx_stalled;
|
||||
+ unsigned int rx_queue_max;
|
||||
+ unsigned int rx_queue_len;
|
||||
|
||||
struct gnttab_copy grant_copy_op[MAX_GRANT_COPY_OPS];
|
||||
|
||||
@@ -199,18 +198,14 @@ struct xenvif_queue { /* Per-queue data for xenvif */
|
||||
struct xenvif_stats stats;
|
||||
};
|
||||
|
||||
+/* Maximum number of Rx slots a to-guest packet may use, including the
|
||||
+ * slot needed for GSO meta-data.
|
||||
+ */
|
||||
+#define XEN_NETBK_RX_SLOTS_MAX (MAX_SKB_FRAGS + 1)
|
||||
+
|
||||
enum state_bit_shift {
|
||||
/* This bit marks that the vif is connected */
|
||||
VIF_STATUS_CONNECTED,
|
||||
- /* This bit signals the RX thread that queuing was stopped (in
|
||||
- * start_xmit), and either the timer fired or an RX interrupt came
|
||||
- */
|
||||
- QUEUE_STATUS_RX_PURGE_EVENT,
|
||||
- /* This bit tells the interrupt handler that this queue was the reason
|
||||
- * for the carrier off, so it should kick the thread. Only queues which
|
||||
- * brought it down can turn on the carrier.
|
||||
- */
|
||||
- QUEUE_STATUS_RX_STALLED
|
||||
};
|
||||
|
||||
struct xenvif {
|
||||
@@ -246,6 +241,14 @@ struct xenvif {
|
||||
struct net_device *dev;
|
||||
};
|
||||
|
||||
+struct xenvif_rx_cb {
|
||||
+ unsigned long expires;
|
||||
+ int meta_slots_used;
|
||||
+ bool full_coalesce;
|
||||
+};
|
||||
+
|
||||
+#define XENVIF_RX_CB(skb) ((struct xenvif_rx_cb *)(skb)->cb)
|
||||
+
|
||||
static inline struct xenbus_device *xenvif_to_xenbus_device(struct xenvif *vif)
|
||||
{
|
||||
return to_xenbus_device(vif->dev->dev.parent);
|
||||
@@ -291,6 +294,8 @@ void xenvif_kick_thread(struct xenvif_queue *queue);
|
||||
|
||||
int xenvif_dealloc_kthread(void *data);
|
||||
|
||||
+void xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb);
|
||||
+
|
||||
/* Determine whether the needed number of slots (req) are available,
|
||||
* and set req_event if not.
|
||||
*/
|
||||
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
|
||||
index 6879251..9e8af0b 100644
|
||||
--- a/drivers/net/xen-netback/interface.c
|
||||
+++ b/drivers/net/xen-netback/interface.c
|
||||
@@ -43,6 +43,9 @@
|
||||
#define XENVIF_QUEUE_LENGTH 32
|
||||
#define XENVIF_NAPI_WEIGHT 64
|
||||
|
||||
+/* Number of bytes allowed on the internal guest Rx queue. */
|
||||
+#define XENVIF_RX_QUEUE_BYTES (XEN_NETIF_RX_RING_SIZE/2 * PAGE_SIZE)
|
||||
+
|
||||
/* This function is used to set SKBTX_DEV_ZEROCOPY as well as
|
||||
* increasing the inflight counter. We need to increase the inflight
|
||||
* counter because core driver calls into xenvif_zerocopy_callback
|
||||
@@ -63,7 +66,8 @@ void xenvif_skb_zerocopy_complete(struct xenvif_queue *queue)
|
||||
int xenvif_schedulable(struct xenvif *vif)
|
||||
{
|
||||
return netif_running(vif->dev) &&
|
||||
- test_bit(VIF_STATUS_CONNECTED, &vif->status);
|
||||
+ test_bit(VIF_STATUS_CONNECTED, &vif->status) &&
|
||||
+ !vif->disabled;
|
||||
}
|
||||
|
||||
static irqreturn_t xenvif_tx_interrupt(int irq, void *dev_id)
|
||||
@@ -104,16 +108,7 @@ int xenvif_poll(struct napi_struct *napi, int budget)
|
||||
static irqreturn_t xenvif_rx_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
struct xenvif_queue *queue = dev_id;
|
||||
- struct netdev_queue *net_queue =
|
||||
- netdev_get_tx_queue(queue->vif->dev, queue->id);
|
||||
|
||||
- /* QUEUE_STATUS_RX_PURGE_EVENT is only set if either QDisc was off OR
|
||||
- * the carrier went down and this queue was previously blocked
|
||||
- */
|
||||
- if (unlikely(netif_tx_queue_stopped(net_queue) ||
|
||||
- (!netif_carrier_ok(queue->vif->dev) &&
|
||||
- test_bit(QUEUE_STATUS_RX_STALLED, &queue->status))))
|
||||
- set_bit(QUEUE_STATUS_RX_PURGE_EVENT, &queue->status);
|
||||
xenvif_kick_thread(queue);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
@@ -141,24 +136,13 @@ void xenvif_wake_queue(struct xenvif_queue *queue)
|
||||
netif_tx_wake_queue(netdev_get_tx_queue(dev, id));
|
||||
}
|
||||
|
||||
-/* Callback to wake the queue's thread and turn the carrier off on timeout */
|
||||
-static void xenvif_rx_stalled(unsigned long data)
|
||||
-{
|
||||
- struct xenvif_queue *queue = (struct xenvif_queue *)data;
|
||||
-
|
||||
- if (xenvif_queue_stopped(queue)) {
|
||||
- set_bit(QUEUE_STATUS_RX_PURGE_EVENT, &queue->status);
|
||||
- xenvif_kick_thread(queue);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct xenvif *vif = netdev_priv(dev);
|
||||
struct xenvif_queue *queue = NULL;
|
||||
unsigned int num_queues = vif->num_queues;
|
||||
u16 index;
|
||||
- int min_slots_needed;
|
||||
+ struct xenvif_rx_cb *cb;
|
||||
|
||||
BUG_ON(skb->dev != dev);
|
||||
|
||||
@@ -181,30 +165,10 @@ static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
!xenvif_schedulable(vif))
|
||||
goto drop;
|
||||
|
||||
- /* At best we'll need one slot for the header and one for each
|
||||
- * frag.
|
||||
- */
|
||||
- min_slots_needed = 1 + skb_shinfo(skb)->nr_frags;
|
||||
+ cb = XENVIF_RX_CB(skb);
|
||||
+ cb->expires = jiffies + rx_drain_timeout_jiffies;
|
||||
|
||||
- /* If the skb is GSO then we'll also need an extra slot for the
|
||||
- * metadata.
|
||||
- */
|
||||
- if (skb_is_gso(skb))
|
||||
- min_slots_needed++;
|
||||
-
|
||||
- /* If the skb can't possibly fit in the remaining slots
|
||||
- * then turn off the queue to give the ring a chance to
|
||||
- * drain.
|
||||
- */
|
||||
- if (!xenvif_rx_ring_slots_available(queue, min_slots_needed)) {
|
||||
- queue->rx_stalled.function = xenvif_rx_stalled;
|
||||
- queue->rx_stalled.data = (unsigned long)queue;
|
||||
- netif_tx_stop_queue(netdev_get_tx_queue(dev, queue->id));
|
||||
- mod_timer(&queue->rx_stalled,
|
||||
- jiffies + rx_drain_timeout_jiffies);
|
||||
- }
|
||||
-
|
||||
- skb_queue_tail(&queue->rx_queue, skb);
|
||||
+ xenvif_rx_queue_tail(queue, skb);
|
||||
xenvif_kick_thread(queue);
|
||||
|
||||
return NETDEV_TX_OK;
|
||||
@@ -498,6 +462,8 @@ int xenvif_init_queue(struct xenvif_queue *queue)
|
||||
init_timer(&queue->credit_timeout);
|
||||
queue->credit_window_start = get_jiffies_64();
|
||||
|
||||
+ queue->rx_queue_max = XENVIF_RX_QUEUE_BYTES;
|
||||
+
|
||||
skb_queue_head_init(&queue->rx_queue);
|
||||
skb_queue_head_init(&queue->tx_queue);
|
||||
|
||||
@@ -529,8 +495,6 @@ int xenvif_init_queue(struct xenvif_queue *queue)
|
||||
queue->grant_tx_handle[i] = NETBACK_INVALID_HANDLE;
|
||||
}
|
||||
|
||||
- init_timer(&queue->rx_stalled);
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -664,7 +628,6 @@ void xenvif_disconnect(struct xenvif *vif)
|
||||
netif_napi_del(&queue->napi);
|
||||
|
||||
if (queue->task) {
|
||||
- del_timer_sync(&queue->rx_stalled);
|
||||
kthread_stop(queue->task);
|
||||
queue->task = NULL;
|
||||
}
|
||||
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
|
||||
index 08f6599..57aa3b5 100644
|
||||
--- a/drivers/net/xen-netback/netback.c
|
||||
+++ b/drivers/net/xen-netback/netback.c
|
||||
@@ -55,8 +55,8 @@
|
||||
bool separate_tx_rx_irq = 1;
|
||||
module_param(separate_tx_rx_irq, bool, 0644);
|
||||
|
||||
-/* When guest ring is filled up, qdisc queues the packets for us, but we have
|
||||
- * to timeout them, otherwise other guests' packets can get stuck there
|
||||
+/* The time that packets can stay on the guest Rx internal queue
|
||||
+ * before they are dropped.
|
||||
*/
|
||||
unsigned int rx_drain_timeout_msecs = 10000;
|
||||
module_param(rx_drain_timeout_msecs, uint, 0444);
|
||||
@@ -83,7 +83,6 @@ static void make_tx_response(struct xenvif_queue *queue,
|
||||
s8 st);
|
||||
|
||||
static inline int tx_work_todo(struct xenvif_queue *queue);
|
||||
-static inline int rx_work_todo(struct xenvif_queue *queue);
|
||||
|
||||
static struct xen_netif_rx_response *make_rx_response(struct xenvif_queue *queue,
|
||||
u16 id,
|
||||
@@ -163,6 +162,69 @@ bool xenvif_rx_ring_slots_available(struct xenvif_queue *queue, int needed)
|
||||
return false;
|
||||
}
|
||||
|
||||
+void xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb)
|
||||
+{
|
||||
+ unsigned long flags;
|
||||
+
|
||||
+ spin_lock_irqsave(&queue->rx_queue.lock, flags);
|
||||
+
|
||||
+ __skb_queue_tail(&queue->rx_queue, skb);
|
||||
+
|
||||
+ queue->rx_queue_len += skb->len;
|
||||
+ if (queue->rx_queue_len > queue->rx_queue_max)
|
||||
+ netif_tx_stop_queue(netdev_get_tx_queue(queue->vif->dev, queue->id));
|
||||
+
|
||||
+ spin_unlock_irqrestore(&queue->rx_queue.lock, flags);
|
||||
+}
|
||||
+
|
||||
+static struct sk_buff *xenvif_rx_dequeue(struct xenvif_queue *queue)
|
||||
+{
|
||||
+ struct sk_buff *skb;
|
||||
+
|
||||
+ spin_lock_irq(&queue->rx_queue.lock);
|
||||
+
|
||||
+ skb = __skb_dequeue(&queue->rx_queue);
|
||||
+ if (skb)
|
||||
+ queue->rx_queue_len -= skb->len;
|
||||
+
|
||||
+ spin_unlock_irq(&queue->rx_queue.lock);
|
||||
+
|
||||
+ return skb;
|
||||
+}
|
||||
+
|
||||
+static void xenvif_rx_queue_maybe_wake(struct xenvif_queue *queue)
|
||||
+{
|
||||
+ spin_lock_irq(&queue->rx_queue.lock);
|
||||
+
|
||||
+ if (queue->rx_queue_len < queue->rx_queue_max)
|
||||
+ netif_tx_wake_queue(netdev_get_tx_queue(queue->vif->dev, queue->id));
|
||||
+
|
||||
+ spin_unlock_irq(&queue->rx_queue.lock);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static void xenvif_rx_queue_purge(struct xenvif_queue *queue)
|
||||
+{
|
||||
+ struct sk_buff *skb;
|
||||
+ while ((skb = xenvif_rx_dequeue(queue)) != NULL)
|
||||
+ kfree_skb(skb);
|
||||
+}
|
||||
+
|
||||
+static void xenvif_rx_queue_drop_expired(struct xenvif_queue *queue)
|
||||
+{
|
||||
+ struct sk_buff *skb;
|
||||
+
|
||||
+ for(;;) {
|
||||
+ skb = skb_peek(&queue->rx_queue);
|
||||
+ if (!skb)
|
||||
+ break;
|
||||
+ if (time_before(jiffies, XENVIF_RX_CB(skb)->expires))
|
||||
+ break;
|
||||
+ xenvif_rx_dequeue(queue);
|
||||
+ kfree_skb(skb);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* Returns true if we should start a new receive buffer instead of
|
||||
* adding 'size' bytes to a buffer which currently contains 'offset'
|
||||
@@ -237,13 +299,6 @@ static struct xenvif_rx_meta *get_next_rx_buffer(struct xenvif_queue *queue,
|
||||
return meta;
|
||||
}
|
||||
|
||||
-struct xenvif_rx_cb {
|
||||
- int meta_slots_used;
|
||||
- bool full_coalesce;
|
||||
-};
|
||||
-
|
||||
-#define XENVIF_RX_CB(skb) ((struct xenvif_rx_cb *)(skb)->cb)
|
||||
-
|
||||
/*
|
||||
* Set up the grant operations for this fragment. If it's a flipping
|
||||
* interface, we also set up the unmap request from here.
|
||||
@@ -587,7 +642,8 @@ static void xenvif_rx_action(struct xenvif_queue *queue)
|
||||
|
||||
skb_queue_head_init(&rxq);
|
||||
|
||||
- while ((skb = skb_dequeue(&queue->rx_queue)) != NULL) {
|
||||
+ while (xenvif_rx_ring_slots_available(queue, XEN_NETBK_RX_SLOTS_MAX)
|
||||
+ && (skb = xenvif_rx_dequeue(queue)) != NULL) {
|
||||
RING_IDX max_slots_needed;
|
||||
RING_IDX old_req_cons;
|
||||
RING_IDX ring_slots_used;
|
||||
@@ -634,15 +690,6 @@ static void xenvif_rx_action(struct xenvif_queue *queue)
|
||||
skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6))
|
||||
max_slots_needed++;
|
||||
|
||||
- /* If the skb may not fit then bail out now */
|
||||
- if (!xenvif_rx_ring_slots_available(queue, max_slots_needed)) {
|
||||
- skb_queue_head(&queue->rx_queue, skb);
|
||||
- need_to_notify = true;
|
||||
- queue->rx_last_skb_slots = max_slots_needed;
|
||||
- break;
|
||||
- } else
|
||||
- queue->rx_last_skb_slots = 0;
|
||||
-
|
||||
old_req_cons = queue->rx.req_cons;
|
||||
XENVIF_RX_CB(skb)->meta_slots_used = xenvif_gop_skb(skb, &npo, queue);
|
||||
ring_slots_used = queue->rx.req_cons - old_req_cons;
|
||||
@@ -1869,12 +1916,6 @@ void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx)
|
||||
}
|
||||
}
|
||||
|
||||
-static inline int rx_work_todo(struct xenvif_queue *queue)
|
||||
-{
|
||||
- return (!skb_queue_empty(&queue->rx_queue) &&
|
||||
- xenvif_rx_ring_slots_available(queue, queue->rx_last_skb_slots));
|
||||
-}
|
||||
-
|
||||
static inline int tx_work_todo(struct xenvif_queue *queue)
|
||||
{
|
||||
if (likely(RING_HAS_UNCONSUMED_REQUESTS(&queue->tx)))
|
||||
@@ -1931,92 +1972,64 @@ err:
|
||||
return err;
|
||||
}
|
||||
|
||||
-static void xenvif_start_queue(struct xenvif_queue *queue)
|
||||
+static bool xenvif_have_rx_work(struct xenvif_queue *queue)
|
||||
{
|
||||
- if (xenvif_schedulable(queue->vif))
|
||||
- xenvif_wake_queue(queue);
|
||||
+ return (!skb_queue_empty(&queue->rx_queue)
|
||||
+ && xenvif_rx_ring_slots_available(queue, XEN_NETBK_RX_SLOTS_MAX))
|
||||
+ || kthread_should_stop()
|
||||
+ || queue->vif->disabled;
|
||||
}
|
||||
|
||||
-/* Only called from the queue's thread, it handles the situation when the guest
|
||||
- * doesn't post enough requests on the receiving ring.
|
||||
- * First xenvif_start_xmit disables QDisc and start a timer, and then either the
|
||||
- * timer fires, or the guest send an interrupt after posting new request. If it
|
||||
- * is the timer, the carrier is turned off here.
|
||||
- * */
|
||||
-static void xenvif_rx_purge_event(struct xenvif_queue *queue)
|
||||
+static long xenvif_rx_queue_timeout(struct xenvif_queue *queue)
|
||||
{
|
||||
- /* Either the last unsuccesful skb or at least 1 slot should fit */
|
||||
- int needed = queue->rx_last_skb_slots ?
|
||||
- queue->rx_last_skb_slots : 1;
|
||||
+ struct sk_buff *skb;
|
||||
+ long timeout;
|
||||
|
||||
- /* It is assumed that if the guest post new slots after this, the RX
|
||||
- * interrupt will set the QUEUE_STATUS_RX_PURGE_EVENT bit and wake up
|
||||
- * the thread again
|
||||
- */
|
||||
- set_bit(QUEUE_STATUS_RX_STALLED, &queue->status);
|
||||
- if (!xenvif_rx_ring_slots_available(queue, needed)) {
|
||||
- rtnl_lock();
|
||||
- if (netif_carrier_ok(queue->vif->dev)) {
|
||||
- /* Timer fired and there are still no slots. Turn off
|
||||
- * everything except the interrupts
|
||||
- */
|
||||
- netif_carrier_off(queue->vif->dev);
|
||||
- skb_queue_purge(&queue->rx_queue);
|
||||
- queue->rx_last_skb_slots = 0;
|
||||
- if (net_ratelimit())
|
||||
- netdev_err(queue->vif->dev, "Carrier off due to lack of guest response on queue %d\n", queue->id);
|
||||
- } else {
|
||||
- /* Probably an another queue already turned the carrier
|
||||
- * off, make sure nothing is stucked in the internal
|
||||
- * queue of this queue
|
||||
- */
|
||||
- skb_queue_purge(&queue->rx_queue);
|
||||
- queue->rx_last_skb_slots = 0;
|
||||
- }
|
||||
- rtnl_unlock();
|
||||
- } else if (!netif_carrier_ok(queue->vif->dev)) {
|
||||
- unsigned int num_queues = queue->vif->num_queues;
|
||||
- unsigned int i;
|
||||
- /* The carrier was down, but an interrupt kicked
|
||||
- * the thread again after new requests were
|
||||
- * posted
|
||||
- */
|
||||
- clear_bit(QUEUE_STATUS_RX_STALLED,
|
||||
- &queue->status);
|
||||
- rtnl_lock();
|
||||
- netif_carrier_on(queue->vif->dev);
|
||||
- netif_tx_wake_all_queues(queue->vif->dev);
|
||||
- rtnl_unlock();
|
||||
+ skb = skb_peek(&queue->rx_queue);
|
||||
+ if (!skb)
|
||||
+ return MAX_SCHEDULE_TIMEOUT;
|
||||
|
||||
- for (i = 0; i < num_queues; i++) {
|
||||
- struct xenvif_queue *temp = &queue->vif->queues[i];
|
||||
+ timeout = XENVIF_RX_CB(skb)->expires - jiffies;
|
||||
+ return timeout < 0 ? 0 : timeout;
|
||||
+}
|
||||
|
||||
- xenvif_napi_schedule_or_enable_events(temp);
|
||||
- }
|
||||
- if (net_ratelimit())
|
||||
- netdev_err(queue->vif->dev, "Carrier on again\n");
|
||||
- } else {
|
||||
- /* Queuing were stopped, but the guest posted
|
||||
- * new requests and sent an interrupt
|
||||
- */
|
||||
- clear_bit(QUEUE_STATUS_RX_STALLED,
|
||||
- &queue->status);
|
||||
- del_timer_sync(&queue->rx_stalled);
|
||||
- xenvif_start_queue(queue);
|
||||
+/* Wait until the guest Rx thread has work.
|
||||
+ *
|
||||
+ * The timeout needs to be adjusted based on the current head of the
|
||||
+ * queue (and not just the head at the beginning). In particular, if
|
||||
+ * the queue is initially empty an infinite timeout is used and this
|
||||
+ * needs to be reduced when a skb is queued.
|
||||
+ *
|
||||
+ * This cannot be done with wait_event_timeout() because it only
|
||||
+ * calculates the timeout once.
|
||||
+ */
|
||||
+static void xenvif_wait_for_rx_work(struct xenvif_queue *queue)
|
||||
+{
|
||||
+ DEFINE_WAIT(wait);
|
||||
+
|
||||
+ if (xenvif_have_rx_work(queue))
|
||||
+ return;
|
||||
+
|
||||
+ for (;;) {
|
||||
+ long ret;
|
||||
+
|
||||
+ prepare_to_wait(&queue->wq, &wait, TASK_INTERRUPTIBLE);
|
||||
+ if (xenvif_have_rx_work(queue))
|
||||
+ break;
|
||||
+ ret = schedule_timeout(xenvif_rx_queue_timeout(queue));
|
||||
+ if (!ret)
|
||||
+ break;
|
||||
}
|
||||
+ finish_wait(&queue->wq, &wait);
|
||||
}
|
||||
|
||||
int xenvif_kthread_guest_rx(void *data)
|
||||
{
|
||||
struct xenvif_queue *queue = data;
|
||||
- struct sk_buff *skb;
|
||||
+ struct xenvif *vif = queue->vif;
|
||||
|
||||
- while (!kthread_should_stop()) {
|
||||
- wait_event_interruptible(queue->wq,
|
||||
- rx_work_todo(queue) ||
|
||||
- queue->vif->disabled ||
|
||||
- test_bit(QUEUE_STATUS_RX_PURGE_EVENT, &queue->status) ||
|
||||
- kthread_should_stop());
|
||||
+ for (;;) {
|
||||
+ xenvif_wait_for_rx_work(queue);
|
||||
|
||||
if (kthread_should_stop())
|
||||
break;
|
||||
@@ -2028,35 +2041,29 @@ int xenvif_kthread_guest_rx(void *data)
|
||||
* context so we defer it here, if this thread is
|
||||
* associated with queue 0.
|
||||
*/
|
||||
- if (unlikely(queue->vif->disabled && queue->id == 0)) {
|
||||
- xenvif_carrier_off(queue->vif);
|
||||
- } else if (unlikely(queue->vif->disabled)) {
|
||||
- /* kthread_stop() would be called upon this thread soon,
|
||||
- * be a bit proactive
|
||||
- */
|
||||
- skb_queue_purge(&queue->rx_queue);
|
||||
- queue->rx_last_skb_slots = 0;
|
||||
- } else if (unlikely(test_and_clear_bit(QUEUE_STATUS_RX_PURGE_EVENT,
|
||||
- &queue->status))) {
|
||||
- xenvif_rx_purge_event(queue);
|
||||
- } else if (!netif_carrier_ok(queue->vif->dev)) {
|
||||
- /* Another queue stalled and turned the carrier off, so
|
||||
- * purge the internal queue of queues which were not
|
||||
- * blocked
|
||||
- */
|
||||
- skb_queue_purge(&queue->rx_queue);
|
||||
- queue->rx_last_skb_slots = 0;
|
||||
+ if (unlikely(vif->disabled && queue->id == 0)) {
|
||||
+ xenvif_carrier_off(vif);
|
||||
+ xenvif_rx_queue_purge(queue);
|
||||
+ continue;
|
||||
}
|
||||
|
||||
if (!skb_queue_empty(&queue->rx_queue))
|
||||
xenvif_rx_action(queue);
|
||||
|
||||
+ /* Queued packets may have foreign pages from other
|
||||
+ * domains. These cannot be queued indefinitely as
|
||||
+ * this would starve guests of grant refs and transmit
|
||||
+ * slots.
|
||||
+ */
|
||||
+ xenvif_rx_queue_drop_expired(queue);
|
||||
+
|
||||
+ xenvif_rx_queue_maybe_wake(queue);
|
||||
+
|
||||
cond_resched();
|
||||
}
|
||||
|
||||
/* Bin any remaining skbs */
|
||||
- while ((skb = skb_dequeue(&queue->rx_queue)) != NULL)
|
||||
- dev_kfree_skb(skb);
|
||||
+ xenvif_rx_queue_purge(queue);
|
||||
|
||||
return 0;
|
||||
}
|
||||
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
|
||||
index 5e5cca1..54b5f24 100644
|
||||
--- a/drivers/net/xen-netback/xenbus.c
|
||||
+++ b/drivers/net/xen-netback/xenbus.c
|
||||
@@ -52,6 +52,7 @@ static int xenvif_read_io_ring(struct seq_file *m, void *v)
|
||||
struct xenvif_queue *queue = m->private;
|
||||
struct xen_netif_tx_back_ring *tx_ring = &queue->tx;
|
||||
struct xen_netif_rx_back_ring *rx_ring = &queue->rx;
|
||||
+ struct netdev_queue *dev_queue;
|
||||
|
||||
if (tx_ring->sring) {
|
||||
struct xen_netif_tx_sring *sring = tx_ring->sring;
|
||||
@@ -112,6 +113,13 @@ static int xenvif_read_io_ring(struct seq_file *m, void *v)
|
||||
queue->credit_timeout.expires,
|
||||
jiffies);
|
||||
|
||||
+ dev_queue = netdev_get_tx_queue(queue->vif->dev, queue->id);
|
||||
+
|
||||
+ seq_printf(m, "\nRx internal queue: len %u max %u pkts %u %s\n",
|
||||
+ queue->rx_queue_len, queue->rx_queue_max,
|
||||
+ skb_queue_len(&queue->rx_queue),
|
||||
+ netif_tx_queue_stopped(dev_queue) ? "stopped" : "running");
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
103
debian/patches/bugfix/all/xen-netback-make-feature-rx-notify-mandatory.patch
vendored
Normal file
103
debian/patches/bugfix/all/xen-netback-make-feature-rx-notify-mandatory.patch
vendored
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
From 63350994825046216104c9c4c99db9e7a2715a97 Mon Sep 17 00:00:00 2001
|
||||
From: David Vrabel <david.vrabel@citrix.com>
|
||||
Date: Wed, 22 Oct 2014 14:08:53 +0100
|
||||
Subject: [PATCH 12/14] xen-netback: make feature-rx-notify mandatory
|
||||
Origin: https://git.kernel.org/linus/bc96f648df1bbc2729abbb84513cf4f64273a1f1
|
||||
|
||||
Frontends that do not provide feature-rx-notify may stall because
|
||||
netback depends on the notification from frontend to wake the guest Rx
|
||||
thread (even if can_queue is false).
|
||||
|
||||
This could be fixed but feature-rx-notify was introduced in 2006 and I
|
||||
am not aware of any frontends that do not implement this.
|
||||
|
||||
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
|
||||
Acked-by: Wei Liu <wei.liu2@citrix.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
(cherry picked from commit bc96f648df1bbc2729abbb84513cf4f64273a1f1)
|
||||
---
|
||||
drivers/net/xen-netback/common.h | 5 -----
|
||||
drivers/net/xen-netback/interface.c | 12 +-----------
|
||||
drivers/net/xen-netback/xenbus.c | 13 ++++---------
|
||||
3 files changed, 5 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
|
||||
index d4eb8d2..93ca77c 100644
|
||||
--- a/drivers/net/xen-netback/common.h
|
||||
+++ b/drivers/net/xen-netback/common.h
|
||||
@@ -228,9 +228,6 @@ struct xenvif {
|
||||
u8 ip_csum:1;
|
||||
u8 ipv6_csum:1;
|
||||
|
||||
- /* Internal feature information. */
|
||||
- u8 can_queue:1; /* can queue packets for receiver? */
|
||||
-
|
||||
/* Is this interface disabled? True when backend discovers
|
||||
* frontend is rogue.
|
||||
*/
|
||||
@@ -272,8 +269,6 @@ void xenvif_xenbus_fini(void);
|
||||
|
||||
int xenvif_schedulable(struct xenvif *vif);
|
||||
|
||||
-int xenvif_must_stop_queue(struct xenvif_queue *queue);
|
||||
-
|
||||
int xenvif_queue_stopped(struct xenvif_queue *queue);
|
||||
void xenvif_wake_queue(struct xenvif_queue *queue);
|
||||
|
||||
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
|
||||
index 18cdc81..6879251 100644
|
||||
--- a/drivers/net/xen-netback/interface.c
|
||||
+++ b/drivers/net/xen-netback/interface.c
|
||||
@@ -60,16 +60,6 @@ void xenvif_skb_zerocopy_complete(struct xenvif_queue *queue)
|
||||
atomic_dec(&queue->inflight_packets);
|
||||
}
|
||||
|
||||
-static inline void xenvif_stop_queue(struct xenvif_queue *queue)
|
||||
-{
|
||||
- struct net_device *dev = queue->vif->dev;
|
||||
-
|
||||
- if (!queue->vif->can_queue)
|
||||
- return;
|
||||
-
|
||||
- netif_tx_stop_queue(netdev_get_tx_queue(dev, queue->id));
|
||||
-}
|
||||
-
|
||||
int xenvif_schedulable(struct xenvif *vif)
|
||||
{
|
||||
return netif_running(vif->dev) &&
|
||||
@@ -209,7 +199,7 @@ static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
if (!xenvif_rx_ring_slots_available(queue, min_slots_needed)) {
|
||||
queue->rx_stalled.function = xenvif_rx_stalled;
|
||||
queue->rx_stalled.data = (unsigned long)queue;
|
||||
- xenvif_stop_queue(queue);
|
||||
+ netif_tx_stop_queue(netdev_get_tx_queue(dev, queue->id));
|
||||
mod_timer(&queue->rx_stalled,
|
||||
jiffies + rx_drain_timeout_jiffies);
|
||||
}
|
||||
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
|
||||
index 9c47b89..5e5cca1 100644
|
||||
--- a/drivers/net/xen-netback/xenbus.c
|
||||
+++ b/drivers/net/xen-netback/xenbus.c
|
||||
@@ -873,15 +873,10 @@ static int read_xenbus_vif_flags(struct backend_info *be)
|
||||
if (!rx_copy)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
- if (vif->dev->tx_queue_len != 0) {
|
||||
- if (xenbus_scanf(XBT_NIL, dev->otherend,
|
||||
- "feature-rx-notify", "%d", &val) < 0)
|
||||
- val = 0;
|
||||
- if (val)
|
||||
- vif->can_queue = 1;
|
||||
- else
|
||||
- /* Must be non-zero for pfifo_fast to work. */
|
||||
- vif->dev->tx_queue_len = 1;
|
||||
+ if (xenbus_scanf(XBT_NIL, dev->otherend,
|
||||
+ "feature-rx-notify", "%d", &val) < 0 || val == 0) {
|
||||
+ xenbus_dev_fatal(dev, -EINVAL, "feature-rx-notify is mandatory");
|
||||
+ return -EINVAL;
|
||||
}
|
||||
|
||||
if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-sg",
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
218
debian/patches/bugfix/all/xen-netback-reintroduce-guest-Rx-stall-detection.patch
vendored
Normal file
218
debian/patches/bugfix/all/xen-netback-reintroduce-guest-Rx-stall-detection.patch
vendored
Normal file
|
|
@ -0,0 +1,218 @@
|
|||
From bd54d3b8d2a15e230f81965041169ba0dc2210c8 Mon Sep 17 00:00:00 2001
|
||||
From: David Vrabel <david.vrabel@citrix.com>
|
||||
Date: Wed, 22 Oct 2014 14:08:55 +0100
|
||||
Subject: [PATCH 14/14] xen-netback: reintroduce guest Rx stall detection
|
||||
Origin: https://git.kernel.org/linus/ecf08d2dbb96d5a4b4bcc53a39e8d29cc8fef02e
|
||||
|
||||
If a frontend not receiving packets it is useful to detect this and
|
||||
turn off the carrier so packets are dropped early instead of being
|
||||
queued and drained when they expire.
|
||||
|
||||
A to-guest queue is stalled if it doesn't have enough free slots for a
|
||||
an extended period of time (default 60 s).
|
||||
|
||||
If at least one queue is stalled, the carrier is turned off (in the
|
||||
expectation that the other queues will soon stall as well). The
|
||||
carrier is only turned on once all queues are ready.
|
||||
|
||||
When the frontend connects, all the queues start in the stalled state
|
||||
and only become ready once the frontend queues enough Rx requests.
|
||||
|
||||
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
|
||||
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
(cherry picked from commit ecf08d2dbb96d5a4b4bcc53a39e8d29cc8fef02e)
|
||||
---
|
||||
drivers/net/xen-netback/common.h | 5 +++
|
||||
drivers/net/xen-netback/interface.c | 5 ++-
|
||||
drivers/net/xen-netback/netback.c | 76 +++++++++++++++++++++++++++++++++++
|
||||
drivers/net/xen-netback/xenbus.c | 1 +
|
||||
4 files changed, 86 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
|
||||
index c264240..083ecc9 100644
|
||||
--- a/drivers/net/xen-netback/common.h
|
||||
+++ b/drivers/net/xen-netback/common.h
|
||||
@@ -179,6 +179,8 @@ struct xenvif_queue { /* Per-queue data for xenvif */
|
||||
|
||||
unsigned int rx_queue_max;
|
||||
unsigned int rx_queue_len;
|
||||
+ unsigned long last_rx_time;
|
||||
+ bool stalled;
|
||||
|
||||
struct gnttab_copy grant_copy_op[MAX_GRANT_COPY_OPS];
|
||||
|
||||
@@ -232,6 +234,9 @@ struct xenvif {
|
||||
/* Queues */
|
||||
struct xenvif_queue *queues;
|
||||
unsigned int num_queues; /* active queues, resource allocated */
|
||||
+ unsigned int stalled_queues;
|
||||
+
|
||||
+ spinlock_t lock;
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
struct dentry *xenvif_dbg_root;
|
||||
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
|
||||
index 9e8af0b..21d8db8 100644
|
||||
--- a/drivers/net/xen-netback/interface.c
|
||||
+++ b/drivers/net/xen-netback/interface.c
|
||||
@@ -419,6 +419,8 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
|
||||
vif->queues = NULL;
|
||||
vif->num_queues = 0;
|
||||
|
||||
+ spin_lock_init(&vif->lock);
|
||||
+
|
||||
dev->netdev_ops = &xenvif_netdev_ops;
|
||||
dev->hw_features = NETIF_F_SG |
|
||||
NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
|
||||
@@ -505,7 +507,6 @@ void xenvif_carrier_on(struct xenvif *vif)
|
||||
dev_set_mtu(vif->dev, ETH_DATA_LEN);
|
||||
netdev_update_features(vif->dev);
|
||||
set_bit(VIF_STATUS_CONNECTED, &vif->status);
|
||||
- netif_carrier_on(vif->dev);
|
||||
if (netif_running(vif->dev))
|
||||
xenvif_up(vif);
|
||||
rtnl_unlock();
|
||||
@@ -565,6 +566,8 @@ int xenvif_connect(struct xenvif_queue *queue, unsigned long tx_ring_ref,
|
||||
disable_irq(queue->rx_irq);
|
||||
}
|
||||
|
||||
+ queue->stalled = true;
|
||||
+
|
||||
task = kthread_create(xenvif_kthread_guest_rx,
|
||||
(void *)queue, "%s-guest-rx", queue->name);
|
||||
if (IS_ERR(task)) {
|
||||
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
|
||||
index 57aa3b5..6563f07 100644
|
||||
--- a/drivers/net/xen-netback/netback.c
|
||||
+++ b/drivers/net/xen-netback/netback.c
|
||||
@@ -62,6 +62,13 @@ unsigned int rx_drain_timeout_msecs = 10000;
|
||||
module_param(rx_drain_timeout_msecs, uint, 0444);
|
||||
unsigned int rx_drain_timeout_jiffies;
|
||||
|
||||
+/* The length of time before the frontend is considered unresponsive
|
||||
+ * because it isn't providing Rx slots.
|
||||
+ */
|
||||
+static unsigned int rx_stall_timeout_msecs = 60000;
|
||||
+module_param(rx_stall_timeout_msecs, uint, 0444);
|
||||
+static unsigned int rx_stall_timeout_jiffies;
|
||||
+
|
||||
unsigned int xenvif_max_queues;
|
||||
module_param_named(max_queues, xenvif_max_queues, uint, 0644);
|
||||
MODULE_PARM_DESC(max_queues,
|
||||
@@ -649,6 +656,8 @@ static void xenvif_rx_action(struct xenvif_queue *queue)
|
||||
RING_IDX ring_slots_used;
|
||||
int i;
|
||||
|
||||
+ queue->last_rx_time = jiffies;
|
||||
+
|
||||
/* We need a cheap worse case estimate for the number of
|
||||
* slots we'll use.
|
||||
*/
|
||||
@@ -1972,10 +1981,67 @@ err:
|
||||
return err;
|
||||
}
|
||||
|
||||
+static void xenvif_queue_carrier_off(struct xenvif_queue *queue)
|
||||
+{
|
||||
+ struct xenvif *vif = queue->vif;
|
||||
+
|
||||
+ queue->stalled = true;
|
||||
+
|
||||
+ /* At least one queue has stalled? Disable the carrier. */
|
||||
+ spin_lock(&vif->lock);
|
||||
+ if (vif->stalled_queues++ == 0) {
|
||||
+ netdev_info(vif->dev, "Guest Rx stalled");
|
||||
+ netif_carrier_off(vif->dev);
|
||||
+ }
|
||||
+ spin_unlock(&vif->lock);
|
||||
+}
|
||||
+
|
||||
+static void xenvif_queue_carrier_on(struct xenvif_queue *queue)
|
||||
+{
|
||||
+ struct xenvif *vif = queue->vif;
|
||||
+
|
||||
+ queue->last_rx_time = jiffies; /* Reset Rx stall detection. */
|
||||
+ queue->stalled = false;
|
||||
+
|
||||
+ /* All queues are ready? Enable the carrier. */
|
||||
+ spin_lock(&vif->lock);
|
||||
+ if (--vif->stalled_queues == 0) {
|
||||
+ netdev_info(vif->dev, "Guest Rx ready");
|
||||
+ netif_carrier_on(vif->dev);
|
||||
+ }
|
||||
+ spin_unlock(&vif->lock);
|
||||
+}
|
||||
+
|
||||
+static bool xenvif_rx_queue_stalled(struct xenvif_queue *queue)
|
||||
+{
|
||||
+ RING_IDX prod, cons;
|
||||
+
|
||||
+ prod = queue->rx.sring->req_prod;
|
||||
+ cons = queue->rx.req_cons;
|
||||
+
|
||||
+ return !queue->stalled
|
||||
+ && prod - cons < XEN_NETBK_RX_SLOTS_MAX
|
||||
+ && time_after(jiffies,
|
||||
+ queue->last_rx_time + rx_stall_timeout_jiffies);
|
||||
+}
|
||||
+
|
||||
+static bool xenvif_rx_queue_ready(struct xenvif_queue *queue)
|
||||
+{
|
||||
+ RING_IDX prod, cons;
|
||||
+
|
||||
+ prod = queue->rx.sring->req_prod;
|
||||
+ cons = queue->rx.req_cons;
|
||||
+
|
||||
+ return queue->stalled
|
||||
+ && prod - cons >= XEN_NETBK_RX_SLOTS_MAX;
|
||||
+}
|
||||
+
|
||||
static bool xenvif_have_rx_work(struct xenvif_queue *queue)
|
||||
{
|
||||
return (!skb_queue_empty(&queue->rx_queue)
|
||||
&& xenvif_rx_ring_slots_available(queue, XEN_NETBK_RX_SLOTS_MAX))
|
||||
+ || xenvif_rx_queue_stalled(queue)
|
||||
+ || xenvif_rx_queue_ready(queue)
|
||||
|| kthread_should_stop()
|
||||
|| queue->vif->disabled;
|
||||
}
|
||||
@@ -2050,6 +2116,15 @@ int xenvif_kthread_guest_rx(void *data)
|
||||
if (!skb_queue_empty(&queue->rx_queue))
|
||||
xenvif_rx_action(queue);
|
||||
|
||||
+ /* If the guest hasn't provided any Rx slots for a
|
||||
+ * while it's probably not responsive, drop the
|
||||
+ * carrier so packets are dropped earlier.
|
||||
+ */
|
||||
+ if (xenvif_rx_queue_stalled(queue))
|
||||
+ xenvif_queue_carrier_off(queue);
|
||||
+ else if (xenvif_rx_queue_ready(queue))
|
||||
+ xenvif_queue_carrier_on(queue);
|
||||
+
|
||||
/* Queued packets may have foreign pages from other
|
||||
* domains. These cannot be queued indefinitely as
|
||||
* this would starve guests of grant refs and transmit
|
||||
@@ -2120,6 +2195,7 @@ static int __init netback_init(void)
|
||||
goto failed_init;
|
||||
|
||||
rx_drain_timeout_jiffies = msecs_to_jiffies(rx_drain_timeout_msecs);
|
||||
+ rx_stall_timeout_jiffies = msecs_to_jiffies(rx_stall_timeout_msecs);
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
xen_netback_dbg_root = debugfs_create_dir("xen-netback", NULL);
|
||||
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
|
||||
index 54b5f24..396b3d9 100644
|
||||
--- a/drivers/net/xen-netback/xenbus.c
|
||||
+++ b/drivers/net/xen-netback/xenbus.c
|
||||
@@ -711,6 +711,7 @@ static void connect(struct backend_info *be)
|
||||
be->vif->queues = vzalloc(requested_num_queues *
|
||||
sizeof(struct xenvif_queue));
|
||||
be->vif->num_queues = requested_num_queues;
|
||||
+ be->vif->stalled_queues = requested_num_queues;
|
||||
|
||||
for (queue_index = 0; queue_index < requested_num_queues; ++queue_index) {
|
||||
queue = &be->vif->queues[queue_index];
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
36
debian/patches/bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch
vendored
Normal file
36
debian/patches/bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch
vendored
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
From 2d209a4c68627218140f29ca31ee1f01ce476b89 Mon Sep 17 00:00:00 2001
|
||||
From: Ian Campbell <ijc@hellion.org.uk>
|
||||
Date: Wed, 26 Nov 2014 15:30:03 +0000
|
||||
Subject: [PATCH 1/2] arm64: add missing dts entry for X-Gene platform.
|
||||
Origin: http://lists.infradead.org/pipermail/linux-arm-kernel/2013-December/216347.html
|
||||
|
||||
This add missing dts entry for X-Gene reboot driver.
|
||||
|
||||
Signed-off-by: Feng Kan <fkan at apm.com>
|
||||
|
||||
ijc -- obsoleted by upstream syscon-reboot driver reworking, but that is too
|
||||
big to backport.
|
||||
|
||||
---
|
||||
arch/arm64/boot/dts/apm-storm.dtsi | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
index e2af321..0d796ad 100644
|
||||
--- a/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
@@ -302,6 +302,11 @@
|
||||
interrupts = <0x0 0x4c 0x4>;
|
||||
};
|
||||
|
||||
+ reboot@17000014 {
|
||||
+ compatible = "apm,xgene-reboot";
|
||||
+ reg = <0x0 0x17000014 0x0 0x4>;
|
||||
+ };
|
||||
+
|
||||
serial1: serial@1c021000 {
|
||||
status = "disabled";
|
||||
device_type = "serial";
|
||||
--
|
||||
2.1.3
|
||||
|
||||
37
debian/patches/bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
vendored
Normal file
37
debian/patches/bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
vendored
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
From b2553d6241a68e991e59c0a99857ae6ac21a67a8 Mon Sep 17 00:00:00 2001
|
||||
From: Ian Campbell <ijc@hellion.org.uk>
|
||||
Date: Wed, 26 Nov 2014 15:31:50 +0000
|
||||
Subject: [PATCH 2/2] arm64: removed using of the mask attribute in the dts for
|
||||
reset bit.
|
||||
Origin: http://lists.infradead.org/pipermail/linux-arm-kernel/2013-December/216350.html
|
||||
|
||||
Remove the use of the mask attribute from original reboot driver. The use
|
||||
of the mask attribute provided unneeded complexity and security risk. Also
|
||||
fix minor compilation warning.
|
||||
|
||||
Signed-off-by: Feng Kan <fkan at apm.com>
|
||||
|
||||
ijc -- obsoleted by upstream syscon-reboot driver reworking, but that is too
|
||||
big to backport.
|
||||
|
||||
---
|
||||
drivers/power/reset/xgene-reboot.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
|
||||
index ecd55f8..4a63f8f 100644
|
||||
--- a/drivers/power/reset/xgene-reboot.c
|
||||
+++ b/drivers/power/reset/xgene-reboot.c
|
||||
@@ -73,8 +73,7 @@ static int xgene_reboot_probe(struct platform_device *pdev)
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
- if (of_property_read_u32(pdev->dev.of_node, "mask", &ctx->mask))
|
||||
- ctx->mask = 0xFFFFFFFF;
|
||||
+ ctx->mask = 0x1;
|
||||
|
||||
ctx->pdev = pdev;
|
||||
arm_pm_restart = xgene_restart;
|
||||
--
|
||||
2.1.3
|
||||
|
||||
50
debian/patches/bugfix/x86/x86-asm-traps-Disable-tracing-and-kprobes-in-fixup_b.patch
vendored
Normal file
50
debian/patches/bugfix/x86/x86-asm-traps-Disable-tracing-and-kprobes-in-fixup_b.patch
vendored
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
From: Andy Lutomirski <luto@amacapital.net>
|
||||
Date: Mon, 24 Nov 2014 17:39:06 -0800
|
||||
Subject: x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and
|
||||
sync_regs
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit?id=7ddc6a2199f1da405a2fb68c40db8899b1a8cd87
|
||||
|
||||
These functions can be executed on the int3 stack, so kprobes
|
||||
are dangerous. Tracing is probably a bad idea, too.
|
||||
|
||||
Fixes: b645af2d5905 ("x86_64, traps: Rework bad_iret")
|
||||
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
|
||||
Cc: <stable@vger.kernel.org> # Backport as far back as it would apply
|
||||
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Cc: Steven Rostedt <rostedt@goodmis.org>
|
||||
Link: http://lkml.kernel.org/r/50e33d26adca60816f3ba968875801652507d0c4.1416870125.git.luto@amacapital.net
|
||||
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||||
---
|
||||
arch/x86/kernel/traps.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
|
||||
index de801f2..07ab8e9 100644
|
||||
--- a/arch/x86/kernel/traps.c
|
||||
+++ b/arch/x86/kernel/traps.c
|
||||
@@ -387,7 +387,7 @@ NOKPROBE_SYMBOL(do_int3);
|
||||
* for scheduling or signal handling. The actual stack switch is done in
|
||||
* entry.S
|
||||
*/
|
||||
-asmlinkage __visible struct pt_regs *sync_regs(struct pt_regs *eregs)
|
||||
+asmlinkage __visible notrace struct pt_regs *sync_regs(struct pt_regs *eregs)
|
||||
{
|
||||
struct pt_regs *regs = eregs;
|
||||
/* Did already sync */
|
||||
@@ -413,7 +413,7 @@ struct bad_iret_stack {
|
||||
struct pt_regs regs;
|
||||
};
|
||||
|
||||
-asmlinkage __visible
|
||||
+asmlinkage __visible notrace
|
||||
struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
|
||||
{
|
||||
/*
|
||||
@@ -436,6 +436,7 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
|
||||
BUG_ON(!user_mode_vm(&new_stack->regs));
|
||||
return new_stack;
|
||||
}
|
||||
+NOKPROBE_SYMBOL(fixup_bad_iret);
|
||||
#endif
|
||||
|
||||
/*
|
||||
111
debian/patches/bugfix/x86/x86_64-traps-Fix-the-espfix64-DF-fixup-and-rewrite-i.patch
vendored
Normal file
111
debian/patches/bugfix/x86/x86_64-traps-Fix-the-espfix64-DF-fixup-and-rewrite-i.patch
vendored
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
From: Andy Lutomirski <luto@amacapital.net>
|
||||
Date: Sat, 22 Nov 2014 18:00:31 -0800
|
||||
Subject: x86_64, traps: Fix the espfix64 #DF fixup and rewrite it in C
|
||||
Origin: https://git.kernel.org/linus/af726f21ed8af2cdaa4e93098dc211521218ae65
|
||||
|
||||
There's nothing special enough about the espfix64 double fault fixup to
|
||||
justify writing it in assembly. Move it to C.
|
||||
|
||||
This also fixes a bug: if the double fault came from an IST stack, the
|
||||
old asm code would return to a partially uninitialized stack frame.
|
||||
|
||||
Fixes: 3891a04aafd668686239349ea58f3314ea2af86b
|
||||
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
|
||||
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
arch/x86/kernel/entry_64.S | 34 ++--------------------------------
|
||||
arch/x86/kernel/traps.c | 24 ++++++++++++++++++++++++
|
||||
2 files changed, 26 insertions(+), 32 deletions(-)
|
||||
|
||||
--- a/arch/x86/kernel/entry_64.S
|
||||
+++ b/arch/x86/kernel/entry_64.S
|
||||
@@ -860,6 +860,7 @@ ENTRY(native_iret)
|
||||
jnz native_irq_return_ldt
|
||||
#endif
|
||||
|
||||
+.global native_irq_return_iret
|
||||
native_irq_return_iret:
|
||||
iretq
|
||||
_ASM_EXTABLE(native_irq_return_iret, bad_iret)
|
||||
@@ -954,37 +955,6 @@ ENTRY(retint_kernel)
|
||||
CFI_ENDPROC
|
||||
END(common_interrupt)
|
||||
|
||||
- /*
|
||||
- * If IRET takes a fault on the espfix stack, then we
|
||||
- * end up promoting it to a doublefault. In that case,
|
||||
- * modify the stack to make it look like we just entered
|
||||
- * the #GP handler from user space, similar to bad_iret.
|
||||
- */
|
||||
-#ifdef CONFIG_X86_ESPFIX64
|
||||
- ALIGN
|
||||
-__do_double_fault:
|
||||
- XCPT_FRAME 1 RDI+8
|
||||
- movq RSP(%rdi),%rax /* Trap on the espfix stack? */
|
||||
- sarq $PGDIR_SHIFT,%rax
|
||||
- cmpl $ESPFIX_PGD_ENTRY,%eax
|
||||
- jne do_double_fault /* No, just deliver the fault */
|
||||
- cmpl $__KERNEL_CS,CS(%rdi)
|
||||
- jne do_double_fault
|
||||
- movq RIP(%rdi),%rax
|
||||
- cmpq $native_irq_return_iret,%rax
|
||||
- jne do_double_fault /* This shouldn't happen... */
|
||||
- movq PER_CPU_VAR(kernel_stack),%rax
|
||||
- subq $(6*8-KERNEL_STACK_OFFSET),%rax /* Reset to original stack */
|
||||
- movq %rax,RSP(%rdi)
|
||||
- movq $0,(%rax) /* Missing (lost) #GP error code */
|
||||
- movq $general_protection,RIP(%rdi)
|
||||
- retq
|
||||
- CFI_ENDPROC
|
||||
-END(__do_double_fault)
|
||||
-#else
|
||||
-# define __do_double_fault do_double_fault
|
||||
-#endif
|
||||
-
|
||||
/*
|
||||
* APIC interrupts.
|
||||
*/
|
||||
@@ -1156,7 +1126,7 @@ idtentry overflow do_overflow has_error_
|
||||
idtentry bounds do_bounds has_error_code=0
|
||||
idtentry invalid_op do_invalid_op has_error_code=0
|
||||
idtentry device_not_available do_device_not_available has_error_code=0
|
||||
-idtentry double_fault __do_double_fault has_error_code=1 paranoid=1
|
||||
+idtentry double_fault do_double_fault has_error_code=1 paranoid=1
|
||||
idtentry coprocessor_segment_overrun do_coprocessor_segment_overrun has_error_code=0
|
||||
idtentry invalid_TSS do_invalid_TSS has_error_code=1
|
||||
idtentry segment_not_present do_segment_not_present has_error_code=1
|
||||
--- a/arch/x86/kernel/traps.c
|
||||
+++ b/arch/x86/kernel/traps.c
|
||||
@@ -243,6 +243,30 @@ dotraplinkage void do_double_fault(struc
|
||||
static const char str[] = "double fault";
|
||||
struct task_struct *tsk = current;
|
||||
|
||||
+#ifdef CONFIG_X86_ESPFIX64
|
||||
+ extern unsigned char native_irq_return_iret[];
|
||||
+
|
||||
+ /*
|
||||
+ * If IRET takes a non-IST fault on the espfix64 stack, then we
|
||||
+ * end up promoting it to a doublefault. In that case, modify
|
||||
+ * the stack to make it look like we just entered the #GP
|
||||
+ * handler from user space, similar to bad_iret.
|
||||
+ */
|
||||
+ if (((long)regs->sp >> PGDIR_SHIFT) == ESPFIX_PGD_ENTRY &&
|
||||
+ regs->cs == __KERNEL_CS &&
|
||||
+ regs->ip == (unsigned long)native_irq_return_iret)
|
||||
+ {
|
||||
+ struct pt_regs *normal_regs = task_pt_regs(current);
|
||||
+
|
||||
+ /* Fake a #GP(0) from userspace. */
|
||||
+ memmove(&normal_regs->ip, (void *)regs->sp, 5*8);
|
||||
+ normal_regs->orig_ax = 0; /* Missing (lost) #GP error code */
|
||||
+ regs->ip = (unsigned long)general_protection;
|
||||
+ regs->sp = (unsigned long)&normal_regs->orig_ax;
|
||||
+ return;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
exception_enter();
|
||||
/* Return not checked because double check cannot be ignored */
|
||||
notify_die(DIE_TRAP, str, regs, error_code, X86_TRAP_DF, SIGSEGV);
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
From: Andy Lutomirski <luto@amacapital.net>
|
||||
Date: Sat, 22 Nov 2014 18:00:33 -0800
|
||||
Subject: x86_64, traps: Rework bad_iret
|
||||
Origin: https://git.kernel.org/linus/b645af2d5905c4e32399005b867987919cbfc3ae
|
||||
|
||||
It's possible for iretq to userspace to fail. This can happen because
|
||||
of a bad CS, SS, or RIP.
|
||||
|
||||
Historically, we've handled it by fixing up an exception from iretq to
|
||||
land at bad_iret, which pretends that the failed iret frame was really
|
||||
the hardware part of #GP(0) from userspace. To make this work, there's
|
||||
an extra fixup to fudge the gs base into a usable state.
|
||||
|
||||
This is suboptimal because it loses the original exception. It's also
|
||||
buggy because there's no guarantee that we were on the kernel stack to
|
||||
begin with. For example, if the failing iret happened on return from an
|
||||
NMI, then we'll end up executing general_protection on the NMI stack.
|
||||
This is bad for several reasons, the most immediate of which is that
|
||||
general_protection, as a non-paranoid idtentry, will try to deliver
|
||||
signals and/or schedule from the wrong stack.
|
||||
|
||||
This patch throws out bad_iret entirely. As a replacement, it augments
|
||||
the existing swapgs fudge into a full-blown iret fixup, mostly written
|
||||
in C. It's should be clearer and more correct.
|
||||
|
||||
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
|
||||
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
arch/x86/kernel/entry_64.S | 45 +++++++++++++++++++--------------------------
|
||||
arch/x86/kernel/traps.c | 29 +++++++++++++++++++++++++++++
|
||||
2 files changed, 48 insertions(+), 26 deletions(-)
|
||||
|
||||
--- a/arch/x86/kernel/entry_64.S
|
||||
+++ b/arch/x86/kernel/entry_64.S
|
||||
@@ -843,8 +843,13 @@ ENTRY(native_iret)
|
||||
|
||||
.global native_irq_return_iret
|
||||
native_irq_return_iret:
|
||||
+ /*
|
||||
+ * This may fault. Non-paranoid faults on return to userspace are
|
||||
+ * handled by fixup_bad_iret. These include #SS, #GP, and #NP.
|
||||
+ * Double-faults due to espfix64 are handled in do_double_fault.
|
||||
+ * Other faults here are fatal.
|
||||
+ */
|
||||
iretq
|
||||
- _ASM_EXTABLE(native_irq_return_iret, bad_iret)
|
||||
|
||||
#ifdef CONFIG_X86_ESPFIX64
|
||||
native_irq_return_ldt:
|
||||
@@ -872,25 +877,6 @@ native_irq_return_ldt:
|
||||
jmp native_irq_return_iret
|
||||
#endif
|
||||
|
||||
- .section .fixup,"ax"
|
||||
-bad_iret:
|
||||
- /*
|
||||
- * The iret traps when the %cs or %ss being restored is bogus.
|
||||
- * We've lost the original trap vector and error code.
|
||||
- * #GPF is the most likely one to get for an invalid selector.
|
||||
- * So pretend we completed the iret and took the #GPF in user mode.
|
||||
- *
|
||||
- * We are now running with the kernel GS after exception recovery.
|
||||
- * But error_entry expects us to have user GS to match the user %cs,
|
||||
- * so swap back.
|
||||
- */
|
||||
- pushq $0
|
||||
-
|
||||
- SWAPGS
|
||||
- jmp general_protection
|
||||
-
|
||||
- .previous
|
||||
-
|
||||
/* edi: workmask, edx: work */
|
||||
retint_careful:
|
||||
CFI_RESTORE_STATE
|
||||
@@ -1382,17 +1368,16 @@ error_sti:
|
||||
|
||||
/*
|
||||
* There are two places in the kernel that can potentially fault with
|
||||
- * usergs. Handle them here. The exception handlers after iret run with
|
||||
- * kernel gs again, so don't set the user space flag. B stepping K8s
|
||||
- * sometimes report an truncated RIP for IRET exceptions returning to
|
||||
- * compat mode. Check for these here too.
|
||||
+ * usergs. Handle them here. B stepping K8s sometimes report a
|
||||
+ * truncated RIP for IRET exceptions returning to compat mode. Check
|
||||
+ * for these here too.
|
||||
*/
|
||||
error_kernelspace:
|
||||
CFI_REL_OFFSET rcx, RCX+8
|
||||
incl %ebx
|
||||
leaq native_irq_return_iret(%rip),%rcx
|
||||
cmpq %rcx,RIP+8(%rsp)
|
||||
- je error_swapgs
|
||||
+ je error_bad_iret
|
||||
movl %ecx,%eax /* zero extend */
|
||||
cmpq %rax,RIP+8(%rsp)
|
||||
je bstep_iret
|
||||
@@ -1403,7 +1388,15 @@ error_kernelspace:
|
||||
bstep_iret:
|
||||
/* Fix truncated RIP */
|
||||
movq %rcx,RIP+8(%rsp)
|
||||
- jmp error_swapgs
|
||||
+ /* fall through */
|
||||
+
|
||||
+error_bad_iret:
|
||||
+ SWAPGS
|
||||
+ mov %rsp,%rdi
|
||||
+ call fixup_bad_iret
|
||||
+ mov %rax,%rsp
|
||||
+ decl %ebx /* Return to usergs */
|
||||
+ jmp error_sti
|
||||
CFI_ENDPROC
|
||||
END(error_entry)
|
||||
|
||||
--- a/arch/x86/kernel/traps.c
|
||||
+++ b/arch/x86/kernel/traps.c
|
||||
@@ -407,6 +407,35 @@ asmlinkage __visible struct pt_regs *syn
|
||||
return regs;
|
||||
}
|
||||
NOKPROBE_SYMBOL(sync_regs);
|
||||
+
|
||||
+struct bad_iret_stack {
|
||||
+ void *error_entry_ret;
|
||||
+ struct pt_regs regs;
|
||||
+};
|
||||
+
|
||||
+asmlinkage __visible
|
||||
+struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
|
||||
+{
|
||||
+ /*
|
||||
+ * This is called from entry_64.S early in handling a fault
|
||||
+ * caused by a bad iret to user mode. To handle the fault
|
||||
+ * correctly, we want move our stack frame to task_pt_regs
|
||||
+ * and we want to pretend that the exception came from the
|
||||
+ * iret target.
|
||||
+ */
|
||||
+ struct bad_iret_stack *new_stack =
|
||||
+ container_of(task_pt_regs(current),
|
||||
+ struct bad_iret_stack, regs);
|
||||
+
|
||||
+ /* Copy the IRET target to the new stack. */
|
||||
+ memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
|
||||
+
|
||||
+ /* Copy the remainder of the stack from the current stack. */
|
||||
+ memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
|
||||
+
|
||||
+ BUG_ON(!user_mode_vm(&new_stack->regs));
|
||||
+ return new_stack;
|
||||
+}
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -0,0 +1,131 @@
|
|||
From: Andy Lutomirski <luto@amacapital.net>
|
||||
Date: Sat, 22 Nov 2014 18:00:32 -0800
|
||||
Subject: x86_64, traps: Stop using IST for #SS
|
||||
Origin: https://git.kernel.org/linus/6f442be2fb22be02cafa606f1769fa1e6f894441
|
||||
|
||||
On a 32-bit kernel, this has no effect, since there are no IST stacks.
|
||||
|
||||
On a 64-bit kernel, #SS can only happen in user code, on a failed iret
|
||||
to user space, a canonical violation on access via RSP or RBP, or a
|
||||
genuine stack segment violation in 32-bit kernel code. The first two
|
||||
cases don't need IST, and the latter two cases are unlikely fatal bugs,
|
||||
and promoting them to double faults would be fine.
|
||||
|
||||
This fixes a bug in which the espfix64 code mishandles a stack segment
|
||||
violation.
|
||||
|
||||
This saves 4k of memory per CPU and a tiny bit of code.
|
||||
|
||||
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
|
||||
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
arch/x86/include/asm/page_32_types.h | 1 -
|
||||
arch/x86/include/asm/page_64_types.h | 11 +++++------
|
||||
arch/x86/include/asm/traps.h | 1 +
|
||||
arch/x86/kernel/dumpstack_64.c | 1 -
|
||||
arch/x86/kernel/entry_64.S | 2 +-
|
||||
arch/x86/kernel/traps.c | 18 +-----------------
|
||||
6 files changed, 8 insertions(+), 26 deletions(-)
|
||||
|
||||
--- a/arch/x86/include/asm/page_32_types.h
|
||||
+++ b/arch/x86/include/asm/page_32_types.h
|
||||
@@ -20,7 +20,6 @@
|
||||
#define THREAD_SIZE_ORDER 1
|
||||
#define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER)
|
||||
|
||||
-#define STACKFAULT_STACK 0
|
||||
#define DOUBLEFAULT_STACK 1
|
||||
#define NMI_STACK 0
|
||||
#define DEBUG_STACK 0
|
||||
--- a/arch/x86/include/asm/page_64_types.h
|
||||
+++ b/arch/x86/include/asm/page_64_types.h
|
||||
@@ -14,12 +14,11 @@
|
||||
#define IRQ_STACK_ORDER 2
|
||||
#define IRQ_STACK_SIZE (PAGE_SIZE << IRQ_STACK_ORDER)
|
||||
|
||||
-#define STACKFAULT_STACK 1
|
||||
-#define DOUBLEFAULT_STACK 2
|
||||
-#define NMI_STACK 3
|
||||
-#define DEBUG_STACK 4
|
||||
-#define MCE_STACK 5
|
||||
-#define N_EXCEPTION_STACKS 5 /* hw limit: 7 */
|
||||
+#define DOUBLEFAULT_STACK 1
|
||||
+#define NMI_STACK 2
|
||||
+#define DEBUG_STACK 3
|
||||
+#define MCE_STACK 4
|
||||
+#define N_EXCEPTION_STACKS 4 /* hw limit: 7 */
|
||||
|
||||
#define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT)
|
||||
#define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1))
|
||||
--- a/arch/x86/include/asm/traps.h
|
||||
+++ b/arch/x86/include/asm/traps.h
|
||||
@@ -39,6 +39,7 @@ asmlinkage void simd_coprocessor_error(v
|
||||
|
||||
#ifdef CONFIG_TRACING
|
||||
asmlinkage void trace_page_fault(void);
|
||||
+#define trace_stack_segment stack_segment
|
||||
#define trace_divide_error divide_error
|
||||
#define trace_bounds bounds
|
||||
#define trace_invalid_op invalid_op
|
||||
--- a/arch/x86/kernel/dumpstack_64.c
|
||||
+++ b/arch/x86/kernel/dumpstack_64.c
|
||||
@@ -24,7 +24,6 @@ static char x86_stack_ids[][8] = {
|
||||
[ DEBUG_STACK-1 ] = "#DB",
|
||||
[ NMI_STACK-1 ] = "NMI",
|
||||
[ DOUBLEFAULT_STACK-1 ] = "#DF",
|
||||
- [ STACKFAULT_STACK-1 ] = "#SS",
|
||||
[ MCE_STACK-1 ] = "#MC",
|
||||
#if DEBUG_STKSZ > EXCEPTION_STKSZ
|
||||
[ N_EXCEPTION_STACKS ...
|
||||
--- a/arch/x86/kernel/entry_64.S
|
||||
+++ b/arch/x86/kernel/entry_64.S
|
||||
@@ -1321,7 +1321,7 @@ apicinterrupt3 HYPERVISOR_CALLBACK_VECTO
|
||||
|
||||
idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK
|
||||
idtentry int3 do_int3 has_error_code=0 paranoid=1 shift_ist=DEBUG_STACK
|
||||
-idtentry stack_segment do_stack_segment has_error_code=1 paranoid=1
|
||||
+idtentry stack_segment do_stack_segment has_error_code=1
|
||||
#ifdef CONFIG_XEN
|
||||
idtentry xen_debug do_debug has_error_code=0
|
||||
idtentry xen_int3 do_int3 has_error_code=0
|
||||
--- a/arch/x86/kernel/traps.c
|
||||
+++ b/arch/x86/kernel/traps.c
|
||||
@@ -233,27 +233,11 @@ DO_ERROR(X86_TRAP_UD, SIGILL, "inva
|
||||
DO_ERROR(X86_TRAP_OLD_MF, SIGFPE, "coprocessor segment overrun",coprocessor_segment_overrun)
|
||||
DO_ERROR(X86_TRAP_TS, SIGSEGV, "invalid TSS", invalid_TSS)
|
||||
DO_ERROR(X86_TRAP_NP, SIGBUS, "segment not present", segment_not_present)
|
||||
-#ifdef CONFIG_X86_32
|
||||
DO_ERROR(X86_TRAP_SS, SIGBUS, "stack segment", stack_segment)
|
||||
-#endif
|
||||
DO_ERROR(X86_TRAP_AC, SIGBUS, "alignment check", alignment_check)
|
||||
|
||||
#ifdef CONFIG_X86_64
|
||||
/* Runs on IST stack */
|
||||
-dotraplinkage void do_stack_segment(struct pt_regs *regs, long error_code)
|
||||
-{
|
||||
- enum ctx_state prev_state;
|
||||
-
|
||||
- prev_state = exception_enter();
|
||||
- if (notify_die(DIE_TRAP, "stack segment", regs, error_code,
|
||||
- X86_TRAP_SS, SIGBUS) != NOTIFY_STOP) {
|
||||
- preempt_conditional_sti(regs);
|
||||
- do_trap(X86_TRAP_SS, SIGBUS, "stack segment", regs, error_code, NULL);
|
||||
- preempt_conditional_cli(regs);
|
||||
- }
|
||||
- exception_exit(prev_state);
|
||||
-}
|
||||
-
|
||||
dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
|
||||
{
|
||||
static const char str[] = "double fault";
|
||||
@@ -778,7 +762,7 @@ void __init trap_init(void)
|
||||
set_intr_gate(X86_TRAP_OLD_MF, coprocessor_segment_overrun);
|
||||
set_intr_gate(X86_TRAP_TS, invalid_TSS);
|
||||
set_intr_gate(X86_TRAP_NP, segment_not_present);
|
||||
- set_intr_gate_ist(X86_TRAP_SS, &stack_segment, STACKFAULT_STACK);
|
||||
+ set_intr_gate(X86_TRAP_SS, stack_segment);
|
||||
set_intr_gate(X86_TRAP_GP, general_protection);
|
||||
set_intr_gate(X86_TRAP_SPURIOUS, spurious_interrupt_bug);
|
||||
set_intr_gate(X86_TRAP_MF, coprocessor_error);
|
||||
128
debian/patches/features/all/of-add-optional-options-parameter-to-of_find_node_by.patch
vendored
Normal file
128
debian/patches/features/all/of-add-optional-options-parameter-to-of_find_node_by.patch
vendored
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
From 7130f1ef9a22b7fbfea43443a437a92b19f02309 Mon Sep 17 00:00:00 2001
|
||||
From: Leif Lindholm <leif.lindholm@linaro.org>
|
||||
Date: Fri, 28 Nov 2014 11:34:28 +0000
|
||||
Subject: [PATCH 1/2] of: add optional options parameter to
|
||||
of_find_node_by_path()
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/glikely/linux.git/commit/?id=75c28c09af99a0db0ccd8b4395469761aa736543
|
||||
|
||||
Update of_find_node_by_path():
|
||||
1) Rename function to of_find_node_opts_by_path(), adding an optional
|
||||
pointer argument. Provide a static inline wrapper version of
|
||||
of_find_node_by_path() which calls the new function with NULL as
|
||||
the optional argument.
|
||||
2) Ignore any part of the path beyond and including the ':' separator.
|
||||
3) Set the new provided pointer argument to the beginning of the string
|
||||
following the ':' separator.
|
||||
4: Add tests.
|
||||
|
||||
---
|
||||
drivers/of/base.c | 20 ++++++++++++++++----
|
||||
include/linux/of.h | 14 +++++++++++++-
|
||||
2 files changed, 29 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/of/base.c b/drivers/of/base.c
|
||||
index 9fd1415..da9a8d2 100644
|
||||
--- a/drivers/of/base.c
|
||||
+++ b/drivers/of/base.c
|
||||
@@ -796,10 +796,15 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent,
|
||||
{
|
||||
struct device_node *child;
|
||||
int len = strchrnul(path, '/') - path;
|
||||
+ int term;
|
||||
|
||||
if (!len)
|
||||
return NULL;
|
||||
|
||||
+ term = strchrnul(path, ':') - path;
|
||||
+ if (term < len)
|
||||
+ len = term;
|
||||
+
|
||||
__for_each_child_of_node(parent, child) {
|
||||
const char *name = strrchr(child->full_name, '/');
|
||||
if (WARN(!name, "malformed device_node %s\n", child->full_name))
|
||||
@@ -812,11 +817,14 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent,
|
||||
}
|
||||
|
||||
/**
|
||||
- * of_find_node_by_path - Find a node matching a full OF path
|
||||
+ * of_find_node_opts_by_path - Find a node matching a full OF path
|
||||
* @path: Either the full path to match, or if the path does not
|
||||
* start with '/', the name of a property of the /aliases
|
||||
* node (an alias). In the case of an alias, the node
|
||||
* matching the alias' value will be returned.
|
||||
+ * @opts: Address of a pointer into which to store the start of
|
||||
+ * an options string appended to the end of the path with
|
||||
+ * a ':' separator.
|
||||
*
|
||||
* Valid paths:
|
||||
* /foo/bar Full path
|
||||
@@ -826,11 +834,15 @@ static struct device_node *__of_find_node_by_path(struct device_node *parent,
|
||||
* Returns a node pointer with refcount incremented, use
|
||||
* of_node_put() on it when done.
|
||||
*/
|
||||
-struct device_node *of_find_node_by_path(const char *path)
|
||||
+struct device_node *of_find_node_opts_by_path(const char *path, const char **opts)
|
||||
{
|
||||
struct device_node *np = NULL;
|
||||
struct property *pp;
|
||||
unsigned long flags;
|
||||
+ const char *separator = strchr(path, ':');
|
||||
+
|
||||
+ if (opts)
|
||||
+ *opts = separator ? separator + 1 : NULL;
|
||||
|
||||
if (strcmp(path, "/") == 0)
|
||||
return of_node_get(of_allnodes);
|
||||
@@ -838,7 +850,7 @@ struct device_node *of_find_node_by_path(const char *path)
|
||||
/* The path could begin with an alias */
|
||||
if (*path != '/') {
|
||||
char *p = strchrnul(path, '/');
|
||||
- int len = p - path;
|
||||
+ int len = separator ? separator - path : p - path;
|
||||
|
||||
/* of_aliases must not be NULL */
|
||||
if (!of_aliases)
|
||||
@@ -867,7 +879,7 @@ struct device_node *of_find_node_by_path(const char *path)
|
||||
raw_spin_unlock_irqrestore(&devtree_lock, flags);
|
||||
return np;
|
||||
}
|
||||
-EXPORT_SYMBOL(of_find_node_by_path);
|
||||
+EXPORT_SYMBOL(of_find_node_opts_by_path);
|
||||
|
||||
/**
|
||||
* of_find_node_by_name - Find a node by its "name" property
|
||||
diff --git a/include/linux/of.h b/include/linux/of.h
|
||||
index 9d97340..0d2b4c4 100644
|
||||
--- a/include/linux/of.h
|
||||
+++ b/include/linux/of.h
|
||||
@@ -228,7 +228,13 @@ extern struct device_node *of_find_matching_node_and_match(
|
||||
const struct of_device_id *matches,
|
||||
const struct of_device_id **match);
|
||||
|
||||
-extern struct device_node *of_find_node_by_path(const char *path);
|
||||
+extern struct device_node *of_find_node_opts_by_path(const char *path,
|
||||
+ const char **opts);
|
||||
+static inline struct device_node *of_find_node_by_path(const char *path)
|
||||
+{
|
||||
+ return of_find_node_opts_by_path(path, NULL);
|
||||
+}
|
||||
+
|
||||
extern struct device_node *of_find_node_by_phandle(phandle handle);
|
||||
extern struct device_node *of_get_parent(const struct device_node *node);
|
||||
extern struct device_node *of_get_next_parent(struct device_node *node);
|
||||
@@ -386,6 +392,12 @@ static inline struct device_node *of_find_node_by_path(const char *path)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+static inline struct device_node *of_find_node_opts_by_path(const char *path,
|
||||
+ const char **opts)
|
||||
+{
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
static inline struct device_node *of_get_parent(const struct device_node *node)
|
||||
{
|
||||
return NULL;
|
||||
--
|
||||
2.1.3
|
||||
|
||||
48
debian/patches/features/all/of-support-passing-console-options-with-stdout-path.patch
vendored
Normal file
48
debian/patches/features/all/of-support-passing-console-options-with-stdout-path.patch
vendored
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
From 469319d402ab844778cf7fbcd94ba1c9d9cfc9ed Mon Sep 17 00:00:00 2001
|
||||
From: Leif Lindholm <leif.lindholm@linaro.org>
|
||||
Date: Thu, 27 Nov 2014 17:56:07 +0000
|
||||
Subject: [PATCH 2/2] of: support passing console options with stdout-path
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/glikely/linux.git/commit/?id=7914a7c5651a51617d952e8fa745000ed8c4f001
|
||||
|
||||
Support specifying console options (like with console=ttyXN,<options>)
|
||||
by appending them to the stdout-path property after a separating ':'.
|
||||
|
||||
Example:
|
||||
stdout-path = "uart0:115200";
|
||||
|
||||
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
|
||||
[grant.likely: minor rework to shorten the diffstat]
|
||||
Signed-off-by: Grant Likely <grant.likely@linaro.org>
|
||||
---
|
||||
drivers/of/base.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/of/base.c
|
||||
+++ b/drivers/of/base.c
|
||||
@@ -37,6 +37,7 @@ EXPORT_SYMBOL(of_allnodes);
|
||||
struct device_node *of_chosen;
|
||||
struct device_node *of_aliases;
|
||||
struct device_node *of_stdout;
|
||||
+static const char *of_stdout_options;
|
||||
|
||||
struct kset *of_kset;
|
||||
|
||||
@@ -1840,7 +1841,7 @@ void of_alias_scan(void * (*dt_alloc)(u6
|
||||
if (IS_ENABLED(CONFIG_PPC) && !name)
|
||||
name = of_get_property(of_aliases, "stdout", NULL);
|
||||
if (name)
|
||||
- of_stdout = of_find_node_by_path(name);
|
||||
+ of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
|
||||
}
|
||||
|
||||
if (!of_aliases)
|
||||
@@ -1966,7 +1967,8 @@ bool of_console_check(struct device_node
|
||||
{
|
||||
if (!dn || dn != of_stdout || console_set_on_cmdline)
|
||||
return false;
|
||||
- return !add_preferred_console(name, index, NULL);
|
||||
+ return !add_preferred_console(name, index,
|
||||
+ kstrdup(of_stdout_options, GFP_KERNEL));
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(of_console_check);
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From f82f99afaa65fd28d0f8409c50e8fcc65ee5e15b Mon Sep 17 00:00:00 2001
|
||||
From: Karsten Merker <merker@debian.org>
|
||||
Date: Wed, 12 Nov 2014 00:01:46 +0100
|
||||
Subject: ARM: dts: sunxi: Banana Pi: increase startup-delay for the GMAC PHY regulator
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/mripard/linux.git/commit/?h=sunxi/dt-for-3.19&id=f82f99afaa65fd28d0f8409c50e8fcc65ee5e15b
|
||||
|
||||
On the LeMaker Banana Pi, probing the external ethernet PHY connected
|
||||
to the SoC's internal GMAC module sometimes fails. The PHY power
|
||||
supply is handled via a GPIO-controlled regulator, and the existing
|
||||
regulator startup-delay of 50000us is too short to make sure that the
|
||||
PHY is always fully powered up when it is queried by phylib. Tests
|
||||
have shown that to provide a reliable PHY detection, the startup-delay
|
||||
has to be increased to at least 60000us. To have a certain safety margin
|
||||
and to cater for manufacturing variations between different boards,
|
||||
the delay gets set to 100000us as discussed on the linux-arm-kernel
|
||||
mailinglist.
|
||||
|
||||
Signed-off-by: Karsten Merker <merker@debian.org>
|
||||
Acked-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
|
||||
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
|
||||
index 3de847d..1cf1214 100644
|
||||
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
|
||||
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
|
||||
@@ -207,7 +207,7 @@
|
||||
regulator-name = "gmac-3v3";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
- startup-delay-us = <50000>;
|
||||
+ startup-delay-us = <100000>;
|
||||
enable-active-high;
|
||||
gpio = <&pio 7 23 0>;
|
||||
};
|
||||
|
||||
64
debian/patches/features/arm64/drivers-net-xgene-Add-10GbE-ethtool-support.patch
vendored
Normal file
64
debian/patches/features/arm64/drivers-net-xgene-Add-10GbE-ethtool-support.patch
vendored
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
From 23a92cd33a89eaf4c76c0a848ec878035c08cc85 Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Thu, 9 Oct 2014 18:32:07 -0700
|
||||
Subject: [PATCH 03/11] drivers: net: xgene: Add 10GbE ethtool support
|
||||
Origin: https://git.kernel.org/linus/41aace6e088d198f2441f3d0e579657d6815234c
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
.../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 28 +++++++++++++++++-----
|
||||
1 file changed, 22 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
|
||||
index 63f2aa5..c1c997b 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
|
||||
@@ -59,10 +59,22 @@ static int xgene_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
|
||||
struct xgene_enet_pdata *pdata = netdev_priv(ndev);
|
||||
struct phy_device *phydev = pdata->phy_dev;
|
||||
|
||||
- if (phydev == NULL)
|
||||
- return -ENODEV;
|
||||
+ if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
|
||||
+ if (phydev == NULL)
|
||||
+ return -ENODEV;
|
||||
|
||||
- return phy_ethtool_gset(phydev, cmd);
|
||||
+ return phy_ethtool_gset(phydev, cmd);
|
||||
+ }
|
||||
+
|
||||
+ cmd->supported = SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE;
|
||||
+ cmd->advertising = cmd->supported;
|
||||
+ ethtool_cmd_speed_set(cmd, SPEED_10000);
|
||||
+ cmd->duplex = DUPLEX_FULL;
|
||||
+ cmd->port = PORT_FIBRE;
|
||||
+ cmd->transceiver = XCVR_EXTERNAL;
|
||||
+ cmd->autoneg = AUTONEG_DISABLE;
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int xgene_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
|
||||
@@ -70,10 +82,14 @@ static int xgene_set_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
|
||||
struct xgene_enet_pdata *pdata = netdev_priv(ndev);
|
||||
struct phy_device *phydev = pdata->phy_dev;
|
||||
|
||||
- if (phydev == NULL)
|
||||
- return -ENODEV;
|
||||
+ if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
|
||||
+ if (phydev == NULL)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ return phy_ethtool_sset(phydev, cmd);
|
||||
+ }
|
||||
|
||||
- return phy_ethtool_sset(phydev, cmd);
|
||||
+ return -EINVAL;
|
||||
}
|
||||
|
||||
static void xgene_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -0,0 +1,662 @@
|
|||
From 226068a83722c5cf3da300cce9bab7201088a061 Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Thu, 9 Oct 2014 18:32:06 -0700
|
||||
Subject: [PATCH 02/11] drivers: net: xgene: Add 10GbE support
|
||||
Origin: https://git.kernel.org/linus/0148d38d36b76b190ddddff68f02d2617ada3bcb
|
||||
|
||||
- Added 10GbE support
|
||||
- Removed unused macros/variables
|
||||
- Moved mac_init call to the end of hardware init
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/ethernet/apm/xgene/Makefile | 3 +-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 14 +-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 58 ++--
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 5 +-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 331 ++++++++++++++++++++++
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 57 ++++
|
||||
6 files changed, 438 insertions(+), 30 deletions(-)
|
||||
create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
|
||||
create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
|
||||
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/Makefile b/drivers/net/ethernet/apm/xgene/Makefile
|
||||
index c643e8a..589b352 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/Makefile
|
||||
+++ b/drivers/net/ethernet/apm/xgene/Makefile
|
||||
@@ -2,5 +2,6 @@
|
||||
# Makefile for APM X-Gene Ethernet Driver.
|
||||
#
|
||||
|
||||
-xgene-enet-objs := xgene_enet_hw.o xgene_enet_main.o xgene_enet_ethtool.o
|
||||
+xgene-enet-objs := xgene_enet_hw.o xgene_enet_xgmac.o \
|
||||
+ xgene_enet_main.o xgene_enet_ethtool.o
|
||||
obj-$(CONFIG_NET_XGENE) += xgene-enet.o
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
index 084ac68..15ec426 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
@@ -42,6 +42,11 @@ static inline u32 xgene_get_bits(u32 val, u32 start, u32 end)
|
||||
return (val & GENMASK(end, start)) >> start;
|
||||
}
|
||||
|
||||
+enum xgene_enet_rm {
|
||||
+ RM0,
|
||||
+ RM3 = 3
|
||||
+};
|
||||
+
|
||||
#define CSR_RING_ID 0x0008
|
||||
#define OVERWRITE BIT(31)
|
||||
#define IS_BUFFER_POOL BIT(20)
|
||||
@@ -52,7 +57,6 @@ static inline u32 xgene_get_bits(u32 val, u32 start, u32 end)
|
||||
#define CSR_RING_WR_BASE 0x0070
|
||||
#define NUM_RING_CONFIG 5
|
||||
#define BUFPOOL_MODE 3
|
||||
-#define RM3 3
|
||||
#define INC_DEC_CMD_ADDR 0x002c
|
||||
#define UDP_HDR_SIZE 2
|
||||
#define BUF_LEN_CODE_2K 0x5000
|
||||
@@ -94,11 +98,9 @@ static inline u32 xgene_get_bits(u32 val, u32 start, u32 end)
|
||||
|
||||
#define BLOCK_ETH_CSR_OFFSET 0x2000
|
||||
#define BLOCK_ETH_RING_IF_OFFSET 0x9000
|
||||
-#define BLOCK_ETH_CLKRST_CSR_OFFSET 0xC000
|
||||
#define BLOCK_ETH_DIAG_CSR_OFFSET 0xD000
|
||||
|
||||
#define BLOCK_ETH_MAC_OFFSET 0x0000
|
||||
-#define BLOCK_ETH_STATS_OFFSET 0x0014
|
||||
#define BLOCK_ETH_MAC_CSR_OFFSET 0x2800
|
||||
|
||||
#define MAC_ADDR_REG_OFFSET 0x00
|
||||
@@ -107,12 +109,6 @@ static inline u32 xgene_get_bits(u32 val, u32 start, u32 end)
|
||||
#define MAC_READ_REG_OFFSET 0x0c
|
||||
#define MAC_COMMAND_DONE_REG_OFFSET 0x10
|
||||
|
||||
-#define STAT_ADDR_REG_OFFSET 0x00
|
||||
-#define STAT_COMMAND_REG_OFFSET 0x04
|
||||
-#define STAT_WRITE_REG_OFFSET 0x08
|
||||
-#define STAT_READ_REG_OFFSET 0x0c
|
||||
-#define STAT_COMMAND_DONE_REG_OFFSET 0x10
|
||||
-
|
||||
#define MII_MGMT_CONFIG_ADDR 0x20
|
||||
#define MII_MGMT_COMMAND_ADDR 0x24
|
||||
#define MII_MGMT_ADDRESS_ADDR 0x28
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
index c432644..9b85239 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include "xgene_enet_main.h"
|
||||
#include "xgene_enet_hw.h"
|
||||
+#include "xgene_enet_xgmac.h"
|
||||
|
||||
static void xgene_enet_init_bufpool(struct xgene_enet_desc_ring *buf_pool)
|
||||
{
|
||||
@@ -390,7 +391,7 @@ static int xgene_enet_process_ring(struct xgene_enet_desc_ring *ring,
|
||||
}
|
||||
}
|
||||
|
||||
- return budget;
|
||||
+ return count;
|
||||
}
|
||||
|
||||
static int xgene_enet_napi(struct napi_struct *napi, const int budget)
|
||||
@@ -456,8 +457,10 @@ static int xgene_enet_open(struct net_device *ndev)
|
||||
return ret;
|
||||
napi_enable(&pdata->rx_ring->napi);
|
||||
|
||||
- if (pdata->phy_dev)
|
||||
+ if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII)
|
||||
phy_start(pdata->phy_dev);
|
||||
+ else
|
||||
+ schedule_delayed_work(&pdata->link_work, PHY_POLL_LINK_OFF);
|
||||
|
||||
netif_start_queue(ndev);
|
||||
|
||||
@@ -471,8 +474,10 @@ static int xgene_enet_close(struct net_device *ndev)
|
||||
|
||||
netif_stop_queue(ndev);
|
||||
|
||||
- if (pdata->phy_dev)
|
||||
+ if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII)
|
||||
phy_stop(pdata->phy_dev);
|
||||
+ else
|
||||
+ cancel_delayed_work_sync(&pdata->link_work);
|
||||
|
||||
napi_disable(&pdata->rx_ring->napi);
|
||||
xgene_enet_free_irq(ndev);
|
||||
@@ -615,7 +620,6 @@ static struct xgene_enet_desc_ring *xgene_enet_create_desc_ring(
|
||||
|
||||
ring->cmd_base = pdata->ring_cmd_addr + (ring->num << 6);
|
||||
ring->cmd = ring->cmd_base + INC_DEC_CMD_ADDR;
|
||||
- pdata->rm = RM3;
|
||||
ring = xgene_enet_setup_ring(ring);
|
||||
netdev_dbg(ndev, "ring info: num=%d size=%d id=%d slots=%d\n",
|
||||
ring->num, ring->size, ring->id, ring->slots);
|
||||
@@ -805,8 +809,13 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
|
||||
|
||||
pdata->phy_mode = of_get_phy_mode(pdev->dev.of_node);
|
||||
if (pdata->phy_mode < 0) {
|
||||
- dev_err(dev, "Incorrect phy-connection-type in DTS\n");
|
||||
- return -EINVAL;
|
||||
+ dev_err(dev, "Unable to get phy-connection-type\n");
|
||||
+ return pdata->phy_mode;
|
||||
+ }
|
||||
+ if (pdata->phy_mode != PHY_INTERFACE_MODE_RGMII &&
|
||||
+ pdata->phy_mode != PHY_INTERFACE_MODE_XGMII) {
|
||||
+ dev_err(dev, "Incorrect phy-connection-type specified\n");
|
||||
+ return -ENODEV;
|
||||
}
|
||||
|
||||
pdata->clk = devm_clk_get(&pdev->dev, NULL);
|
||||
@@ -821,12 +830,18 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
|
||||
pdata->eth_csr_addr = base_addr + BLOCK_ETH_CSR_OFFSET;
|
||||
pdata->eth_ring_if_addr = base_addr + BLOCK_ETH_RING_IF_OFFSET;
|
||||
pdata->eth_diag_csr_addr = base_addr + BLOCK_ETH_DIAG_CSR_OFFSET;
|
||||
- pdata->mcx_mac_addr = base_addr + BLOCK_ETH_MAC_OFFSET;
|
||||
- pdata->mcx_stats_addr = base_addr + BLOCK_ETH_STATS_OFFSET;
|
||||
- pdata->mcx_mac_csr_addr = base_addr + BLOCK_ETH_MAC_CSR_OFFSET;
|
||||
+ if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
|
||||
+ pdata->mcx_mac_addr = base_addr + BLOCK_ETH_MAC_OFFSET;
|
||||
+ pdata->mcx_mac_csr_addr = base_addr + BLOCK_ETH_MAC_CSR_OFFSET;
|
||||
+ pdata->rm = RM3;
|
||||
+ } else {
|
||||
+ pdata->mcx_mac_addr = base_addr + BLOCK_AXG_MAC_OFFSET;
|
||||
+ pdata->mcx_mac_csr_addr = base_addr + BLOCK_AXG_MAC_CSR_OFFSET;
|
||||
+ pdata->rm = RM0;
|
||||
+ }
|
||||
pdata->rx_buff_cnt = NUM_PKT_BUF;
|
||||
|
||||
- return ret;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata)
|
||||
@@ -836,8 +851,7 @@ static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata)
|
||||
u16 dst_ring_num;
|
||||
int ret;
|
||||
|
||||
- pdata->mac_ops->tx_disable(pdata);
|
||||
- pdata->mac_ops->rx_disable(pdata);
|
||||
+ pdata->port_ops->reset(pdata);
|
||||
|
||||
ret = xgene_enet_create_desc_rings(ndev);
|
||||
if (ret) {
|
||||
@@ -856,14 +870,23 @@ static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata)
|
||||
|
||||
dst_ring_num = xgene_enet_dst_ring_num(pdata->rx_ring);
|
||||
pdata->port_ops->cle_bypass(pdata, dst_ring_num, buf_pool->id);
|
||||
+ pdata->mac_ops->init(pdata);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
- pdata->mac_ops = &xgene_gmac_ops;
|
||||
- pdata->port_ops = &xgene_gport_ops;
|
||||
+ switch (pdata->phy_mode) {
|
||||
+ case PHY_INTERFACE_MODE_RGMII:
|
||||
+ pdata->mac_ops = &xgene_gmac_ops;
|
||||
+ pdata->port_ops = &xgene_gport_ops;
|
||||
+ break;
|
||||
+ default:
|
||||
+ pdata->mac_ops = &xgene_xgmac_ops;
|
||||
+ pdata->port_ops = &xgene_xgport_ops;
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
static int xgene_enet_probe(struct platform_device *pdev)
|
||||
@@ -895,8 +918,6 @@ static int xgene_enet_probe(struct platform_device *pdev)
|
||||
goto err;
|
||||
|
||||
xgene_enet_setup_ops(pdata);
|
||||
- pdata->port_ops->reset(pdata);
|
||||
- pdata->mac_ops->init(pdata);
|
||||
|
||||
ret = register_netdev(ndev);
|
||||
if (ret) {
|
||||
@@ -916,7 +937,10 @@ static int xgene_enet_probe(struct platform_device *pdev)
|
||||
|
||||
napi = &pdata->rx_ring->napi;
|
||||
netif_napi_add(ndev, napi, xgene_enet_napi, NAPI_POLL_WEIGHT);
|
||||
- ret = xgene_enet_mdio_config(pdata);
|
||||
+ if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII)
|
||||
+ ret = xgene_enet_mdio_config(pdata);
|
||||
+ else
|
||||
+ INIT_DELAYED_WORK(&pdata->link_work, xgene_enet_link_state);
|
||||
|
||||
return ret;
|
||||
err:
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
index ac180f9..86cf68b 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
@@ -105,18 +105,17 @@ struct xgene_enet_pdata {
|
||||
void __iomem *eth_ring_if_addr;
|
||||
void __iomem *eth_diag_csr_addr;
|
||||
void __iomem *mcx_mac_addr;
|
||||
- void __iomem *mcx_stats_addr;
|
||||
void __iomem *mcx_mac_csr_addr;
|
||||
void __iomem *base_addr;
|
||||
void __iomem *ring_csr_addr;
|
||||
void __iomem *ring_cmd_addr;
|
||||
u32 phy_addr;
|
||||
int phy_mode;
|
||||
- u32 speed;
|
||||
- u16 rm;
|
||||
+ enum xgene_enet_rm rm;
|
||||
struct rtnl_link_stats64 stats;
|
||||
struct xgene_mac_ops *mac_ops;
|
||||
struct xgene_port_ops *port_ops;
|
||||
+ struct delayed_work link_work;
|
||||
};
|
||||
|
||||
/* Set the specified value into a bit-field defined by its starting position
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
|
||||
new file mode 100644
|
||||
index 0000000..cd64b9f
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
|
||||
@@ -0,0 +1,331 @@
|
||||
+/* Applied Micro X-Gene SoC Ethernet Driver
|
||||
+ *
|
||||
+ * Copyright (c) 2014, Applied Micro Circuits Corporation
|
||||
+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
|
||||
+ * Keyur Chudgar <kchudgar@apm.com>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License as published by the
|
||||
+ * Free Software Foundation; either version 2 of the License, or (at your
|
||||
+ * option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
+#include "xgene_enet_main.h"
|
||||
+#include "xgene_enet_hw.h"
|
||||
+#include "xgene_enet_xgmac.h"
|
||||
+
|
||||
+static void xgene_enet_wr_csr(struct xgene_enet_pdata *pdata,
|
||||
+ u32 offset, u32 val)
|
||||
+{
|
||||
+ void __iomem *addr = pdata->eth_csr_addr + offset;
|
||||
+
|
||||
+ iowrite32(val, addr);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_wr_ring_if(struct xgene_enet_pdata *pdata,
|
||||
+ u32 offset, u32 val)
|
||||
+{
|
||||
+ void __iomem *addr = pdata->eth_ring_if_addr + offset;
|
||||
+
|
||||
+ iowrite32(val, addr);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_wr_diag_csr(struct xgene_enet_pdata *pdata,
|
||||
+ u32 offset, u32 val)
|
||||
+{
|
||||
+ void __iomem *addr = pdata->eth_diag_csr_addr + offset;
|
||||
+
|
||||
+ iowrite32(val, addr);
|
||||
+}
|
||||
+
|
||||
+static bool xgene_enet_wr_indirect(void __iomem *addr, void __iomem *wr,
|
||||
+ void __iomem *cmd, void __iomem *cmd_done,
|
||||
+ u32 wr_addr, u32 wr_data)
|
||||
+{
|
||||
+ u32 done;
|
||||
+ u8 wait = 10;
|
||||
+
|
||||
+ iowrite32(wr_addr, addr);
|
||||
+ iowrite32(wr_data, wr);
|
||||
+ iowrite32(XGENE_ENET_WR_CMD, cmd);
|
||||
+
|
||||
+ /* wait for write command to complete */
|
||||
+ while (!(done = ioread32(cmd_done)) && wait--)
|
||||
+ udelay(1);
|
||||
+
|
||||
+ if (!done)
|
||||
+ return false;
|
||||
+
|
||||
+ iowrite32(0, cmd);
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_wr_mac(struct xgene_enet_pdata *pdata,
|
||||
+ u32 wr_addr, u32 wr_data)
|
||||
+{
|
||||
+ void __iomem *addr, *wr, *cmd, *cmd_done;
|
||||
+
|
||||
+ addr = pdata->mcx_mac_addr + MAC_ADDR_REG_OFFSET;
|
||||
+ wr = pdata->mcx_mac_addr + MAC_WRITE_REG_OFFSET;
|
||||
+ cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;
|
||||
+ cmd_done = pdata->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET;
|
||||
+
|
||||
+ if (!xgene_enet_wr_indirect(addr, wr, cmd, cmd_done, wr_addr, wr_data))
|
||||
+ netdev_err(pdata->ndev, "MCX mac write failed, addr: %04x\n",
|
||||
+ wr_addr);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_rd_csr(struct xgene_enet_pdata *pdata,
|
||||
+ u32 offset, u32 *val)
|
||||
+{
|
||||
+ void __iomem *addr = pdata->eth_csr_addr + offset;
|
||||
+
|
||||
+ *val = ioread32(addr);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_rd_diag_csr(struct xgene_enet_pdata *pdata,
|
||||
+ u32 offset, u32 *val)
|
||||
+{
|
||||
+ void __iomem *addr = pdata->eth_diag_csr_addr + offset;
|
||||
+
|
||||
+ *val = ioread32(addr);
|
||||
+}
|
||||
+
|
||||
+static bool xgene_enet_rd_indirect(void __iomem *addr, void __iomem *rd,
|
||||
+ void __iomem *cmd, void __iomem *cmd_done,
|
||||
+ u32 rd_addr, u32 *rd_data)
|
||||
+{
|
||||
+ u32 done;
|
||||
+ u8 wait = 10;
|
||||
+
|
||||
+ iowrite32(rd_addr, addr);
|
||||
+ iowrite32(XGENE_ENET_RD_CMD, cmd);
|
||||
+
|
||||
+ /* wait for read command to complete */
|
||||
+ while (!(done = ioread32(cmd_done)) && wait--)
|
||||
+ udelay(1);
|
||||
+
|
||||
+ if (!done)
|
||||
+ return false;
|
||||
+
|
||||
+ *rd_data = ioread32(rd);
|
||||
+ iowrite32(0, cmd);
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_rd_mac(struct xgene_enet_pdata *pdata,
|
||||
+ u32 rd_addr, u32 *rd_data)
|
||||
+{
|
||||
+ void __iomem *addr, *rd, *cmd, *cmd_done;
|
||||
+
|
||||
+ addr = pdata->mcx_mac_addr + MAC_ADDR_REG_OFFSET;
|
||||
+ rd = pdata->mcx_mac_addr + MAC_READ_REG_OFFSET;
|
||||
+ cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;
|
||||
+ cmd_done = pdata->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET;
|
||||
+
|
||||
+ if (!xgene_enet_rd_indirect(addr, rd, cmd, cmd_done, rd_addr, rd_data))
|
||||
+ netdev_err(pdata->ndev, "MCX mac read failed, addr: %04x\n",
|
||||
+ rd_addr);
|
||||
+}
|
||||
+
|
||||
+static int xgene_enet_ecc_init(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ struct net_device *ndev = pdata->ndev;
|
||||
+ u32 data;
|
||||
+ u8 wait = 10;
|
||||
+
|
||||
+ xgene_enet_wr_diag_csr(pdata, ENET_CFG_MEM_RAM_SHUTDOWN_ADDR, 0x0);
|
||||
+ do {
|
||||
+ usleep_range(100, 110);
|
||||
+ xgene_enet_rd_diag_csr(pdata, ENET_BLOCK_MEM_RDY_ADDR, &data);
|
||||
+ } while ((data != 0xffffffff) && wait--);
|
||||
+
|
||||
+ if (data != 0xffffffff) {
|
||||
+ netdev_err(ndev, "Failed to release memory from shutdown\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIWQASSOC_ADDR, 0);
|
||||
+ xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIFPQASSOC_ADDR, 0);
|
||||
+ xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIQMLITEWQASSOC_ADDR, 0);
|
||||
+ xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIQMLITEFPQASSOC_ADDR, 0);
|
||||
+}
|
||||
+
|
||||
+static void xgene_xgmac_reset(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ xgene_enet_wr_mac(pdata, AXGMAC_CONFIG_0, HSTMACRST);
|
||||
+ xgene_enet_wr_mac(pdata, AXGMAC_CONFIG_0, 0);
|
||||
+}
|
||||
+
|
||||
+static void xgene_xgmac_set_mac_addr(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ u32 addr0, addr1;
|
||||
+ u8 *dev_addr = pdata->ndev->dev_addr;
|
||||
+
|
||||
+ addr0 = (dev_addr[3] << 24) | (dev_addr[2] << 16) |
|
||||
+ (dev_addr[1] << 8) | dev_addr[0];
|
||||
+ addr1 = (dev_addr[5] << 24) | (dev_addr[4] << 16);
|
||||
+
|
||||
+ xgene_enet_wr_mac(pdata, HSTMACADR_LSW_ADDR, addr0);
|
||||
+ xgene_enet_wr_mac(pdata, HSTMACADR_MSW_ADDR, addr1);
|
||||
+}
|
||||
+
|
||||
+static u32 xgene_enet_link_status(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ u32 data;
|
||||
+
|
||||
+ xgene_enet_rd_csr(pdata, XG_LINK_STATUS_ADDR, &data);
|
||||
+
|
||||
+ return data;
|
||||
+}
|
||||
+
|
||||
+static void xgene_xgmac_init(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ u32 data;
|
||||
+
|
||||
+ xgene_xgmac_reset(pdata);
|
||||
+
|
||||
+ xgene_enet_rd_mac(pdata, AXGMAC_CONFIG_1, &data);
|
||||
+ data |= HSTPPEN;
|
||||
+ data &= ~HSTLENCHK;
|
||||
+ xgene_enet_wr_mac(pdata, AXGMAC_CONFIG_1, data);
|
||||
+
|
||||
+ xgene_enet_wr_mac(pdata, HSTMAXFRAME_LENGTH_ADDR, 0x06000600);
|
||||
+ xgene_xgmac_set_mac_addr(pdata);
|
||||
+
|
||||
+ xgene_enet_rd_csr(pdata, XG_RSIF_CONFIG_REG_ADDR, &data);
|
||||
+ data |= CFG_RSIF_FPBUFF_TIMEOUT_EN;
|
||||
+ xgene_enet_wr_csr(pdata, XG_RSIF_CONFIG_REG_ADDR, data);
|
||||
+
|
||||
+ xgene_enet_wr_csr(pdata, XG_CFG_BYPASS_ADDR, RESUME_TX);
|
||||
+ xgene_enet_wr_csr(pdata, XGENET_RX_DV_GATE_REG_0_ADDR, 0);
|
||||
+ xgene_enet_rd_csr(pdata, XG_ENET_SPARE_CFG_REG_ADDR, &data);
|
||||
+ data |= BIT(12);
|
||||
+ xgene_enet_wr_csr(pdata, XG_ENET_SPARE_CFG_REG_ADDR, data);
|
||||
+ xgene_enet_wr_csr(pdata, XG_ENET_SPARE_CFG_REG_1_ADDR, 0x82);
|
||||
+}
|
||||
+
|
||||
+static void xgene_xgmac_rx_enable(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ u32 data;
|
||||
+
|
||||
+ xgene_enet_rd_mac(pdata, AXGMAC_CONFIG_1, &data);
|
||||
+ xgene_enet_wr_mac(pdata, AXGMAC_CONFIG_1, data | HSTRFEN);
|
||||
+}
|
||||
+
|
||||
+static void xgene_xgmac_tx_enable(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ u32 data;
|
||||
+
|
||||
+ xgene_enet_rd_mac(pdata, AXGMAC_CONFIG_1, &data);
|
||||
+ xgene_enet_wr_mac(pdata, AXGMAC_CONFIG_1, data | HSTTFEN);
|
||||
+}
|
||||
+
|
||||
+static void xgene_xgmac_rx_disable(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ u32 data;
|
||||
+
|
||||
+ xgene_enet_rd_mac(pdata, AXGMAC_CONFIG_1, &data);
|
||||
+ xgene_enet_wr_mac(pdata, AXGMAC_CONFIG_1, data & ~HSTRFEN);
|
||||
+}
|
||||
+
|
||||
+static void xgene_xgmac_tx_disable(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ u32 data;
|
||||
+
|
||||
+ xgene_enet_rd_mac(pdata, AXGMAC_CONFIG_1, &data);
|
||||
+ xgene_enet_wr_mac(pdata, AXGMAC_CONFIG_1, data & ~HSTTFEN);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_reset(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ clk_prepare_enable(pdata->clk);
|
||||
+ clk_disable_unprepare(pdata->clk);
|
||||
+ clk_prepare_enable(pdata->clk);
|
||||
+
|
||||
+ xgene_enet_ecc_init(pdata);
|
||||
+ xgene_enet_config_ring_if_assoc(pdata);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_xgcle_bypass(struct xgene_enet_pdata *pdata,
|
||||
+ u32 dst_ring_num, u16 bufpool_id)
|
||||
+{
|
||||
+ u32 cb, fpsel;
|
||||
+
|
||||
+ xgene_enet_rd_csr(pdata, XCLE_BYPASS_REG0_ADDR, &cb);
|
||||
+ cb |= CFG_CLE_BYPASS_EN0;
|
||||
+ CFG_CLE_IP_PROTOCOL0_SET(&cb, 3);
|
||||
+ xgene_enet_wr_csr(pdata, XCLE_BYPASS_REG0_ADDR, cb);
|
||||
+
|
||||
+ fpsel = xgene_enet_ring_bufnum(bufpool_id) - 0x20;
|
||||
+ xgene_enet_rd_csr(pdata, XCLE_BYPASS_REG1_ADDR, &cb);
|
||||
+ CFG_CLE_DSTQID0_SET(&cb, dst_ring_num);
|
||||
+ CFG_CLE_FPSEL0_SET(&cb, fpsel);
|
||||
+ xgene_enet_wr_csr(pdata, XCLE_BYPASS_REG1_ADDR, cb);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_shutdown(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ clk_disable_unprepare(pdata->clk);
|
||||
+}
|
||||
+
|
||||
+void xgene_enet_link_state(struct work_struct *work)
|
||||
+{
|
||||
+ struct xgene_enet_pdata *pdata = container_of(to_delayed_work(work),
|
||||
+ struct xgene_enet_pdata, link_work);
|
||||
+ struct net_device *ndev = pdata->ndev;
|
||||
+ u32 link_status, poll_interval;
|
||||
+
|
||||
+ link_status = xgene_enet_link_status(pdata);
|
||||
+ if (link_status) {
|
||||
+ if (!netif_carrier_ok(ndev)) {
|
||||
+ netif_carrier_on(ndev);
|
||||
+ xgene_xgmac_init(pdata);
|
||||
+ xgene_xgmac_rx_enable(pdata);
|
||||
+ xgene_xgmac_tx_enable(pdata);
|
||||
+ netdev_info(ndev, "Link is Up - 10Gbps\n");
|
||||
+ }
|
||||
+ poll_interval = PHY_POLL_LINK_ON;
|
||||
+ } else {
|
||||
+ if (netif_carrier_ok(ndev)) {
|
||||
+ xgene_xgmac_rx_disable(pdata);
|
||||
+ xgene_xgmac_tx_disable(pdata);
|
||||
+ netif_carrier_off(ndev);
|
||||
+ netdev_info(ndev, "Link is Down\n");
|
||||
+ }
|
||||
+ poll_interval = PHY_POLL_LINK_OFF;
|
||||
+ }
|
||||
+
|
||||
+ schedule_delayed_work(&pdata->link_work, poll_interval);
|
||||
+}
|
||||
+
|
||||
+struct xgene_mac_ops xgene_xgmac_ops = {
|
||||
+ .init = xgene_xgmac_init,
|
||||
+ .reset = xgene_xgmac_reset,
|
||||
+ .rx_enable = xgene_xgmac_rx_enable,
|
||||
+ .tx_enable = xgene_xgmac_tx_enable,
|
||||
+ .rx_disable = xgene_xgmac_rx_disable,
|
||||
+ .tx_disable = xgene_xgmac_tx_disable,
|
||||
+ .set_mac_addr = xgene_xgmac_set_mac_addr,
|
||||
+};
|
||||
+
|
||||
+struct xgene_port_ops xgene_xgport_ops = {
|
||||
+ .reset = xgene_enet_reset,
|
||||
+ .cle_bypass = xgene_enet_xgcle_bypass,
|
||||
+ .shutdown = xgene_enet_shutdown,
|
||||
+};
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
|
||||
new file mode 100644
|
||||
index 0000000..d2d59e7
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
|
||||
@@ -0,0 +1,57 @@
|
||||
+/* Applied Micro X-Gene SoC Ethernet Driver
|
||||
+ *
|
||||
+ * Copyright (c) 2014, Applied Micro Circuits Corporation
|
||||
+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
|
||||
+ * Keyur Chudgar <kchudgar@apm.com>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License as published by the
|
||||
+ * Free Software Foundation; either version 2 of the License, or (at your
|
||||
+ * option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
+#ifndef __XGENE_ENET_XGMAC_H__
|
||||
+#define __XGENE_ENET_XGMAC_H__
|
||||
+
|
||||
+#define BLOCK_AXG_MAC_OFFSET 0x0800
|
||||
+#define BLOCK_AXG_MAC_CSR_OFFSET 0x2000
|
||||
+
|
||||
+#define AXGMAC_CONFIG_0 0x0000
|
||||
+#define AXGMAC_CONFIG_1 0x0004
|
||||
+#define HSTMACRST BIT(31)
|
||||
+#define HSTTCTLEN BIT(31)
|
||||
+#define HSTTFEN BIT(30)
|
||||
+#define HSTRCTLEN BIT(29)
|
||||
+#define HSTRFEN BIT(28)
|
||||
+#define HSTPPEN BIT(7)
|
||||
+#define HSTDRPLT64 BIT(5)
|
||||
+#define HSTLENCHK BIT(3)
|
||||
+#define HSTMACADR_LSW_ADDR 0x0010
|
||||
+#define HSTMACADR_MSW_ADDR 0x0014
|
||||
+#define HSTMAXFRAME_LENGTH_ADDR 0x0020
|
||||
+
|
||||
+#define XG_RSIF_CONFIG_REG_ADDR 0x00a0
|
||||
+#define XCLE_BYPASS_REG0_ADDR 0x0160
|
||||
+#define XCLE_BYPASS_REG1_ADDR 0x0164
|
||||
+#define XG_CFG_BYPASS_ADDR 0x0204
|
||||
+#define XG_LINK_STATUS_ADDR 0x0228
|
||||
+#define XG_ENET_SPARE_CFG_REG_ADDR 0x040c
|
||||
+#define XG_ENET_SPARE_CFG_REG_1_ADDR 0x0410
|
||||
+#define XGENET_RX_DV_GATE_REG_0_ADDR 0x0804
|
||||
+
|
||||
+#define PHY_POLL_LINK_ON (10 * HZ)
|
||||
+#define PHY_POLL_LINK_OFF (PHY_POLL_LINK_ON / 5)
|
||||
+
|
||||
+void xgene_enet_link_state(struct work_struct *work);
|
||||
+extern struct xgene_mac_ops xgene_xgmac_ops;
|
||||
+extern struct xgene_port_ops xgene_xgport_ops;
|
||||
+
|
||||
+#endif /* __XGENE_ENET_XGMAC_H__ */
|
||||
--
|
||||
2.1.0
|
||||
|
||||
55
debian/patches/features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-ethtool-suppo.patch
vendored
Normal file
55
debian/patches/features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-ethtool-suppo.patch
vendored
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
From c566829d7ea3c25a85a372901b0fce080017034b Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Mon, 13 Oct 2014 17:05:35 -0700
|
||||
Subject: [PATCH 06/11] drivers: net: xgene: Add SGMII based 1GbE ethtool
|
||||
support
|
||||
Origin: https://git.kernel.org/linus/5e6a024bebea5bad6b787cf2c0ee28116b4147f0
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
.../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 25 +++++++++++++++-------
|
||||
1 file changed, 17 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
|
||||
index c1c997b..416d6eb 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
|
||||
@@ -64,16 +64,25 @@ static int xgene_get_settings(struct net_device *ndev, struct ethtool_cmd *cmd)
|
||||
return -ENODEV;
|
||||
|
||||
return phy_ethtool_gset(phydev, cmd);
|
||||
+ } else if (pdata->phy_mode == PHY_INTERFACE_MODE_SGMII) {
|
||||
+ cmd->supported = SUPPORTED_1000baseT_Full |
|
||||
+ SUPPORTED_Autoneg | SUPPORTED_MII;
|
||||
+ cmd->advertising = cmd->supported;
|
||||
+ ethtool_cmd_speed_set(cmd, SPEED_1000);
|
||||
+ cmd->duplex = DUPLEX_FULL;
|
||||
+ cmd->port = PORT_MII;
|
||||
+ cmd->transceiver = XCVR_INTERNAL;
|
||||
+ cmd->autoneg = AUTONEG_ENABLE;
|
||||
+ } else {
|
||||
+ cmd->supported = SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE;
|
||||
+ cmd->advertising = cmd->supported;
|
||||
+ ethtool_cmd_speed_set(cmd, SPEED_10000);
|
||||
+ cmd->duplex = DUPLEX_FULL;
|
||||
+ cmd->port = PORT_FIBRE;
|
||||
+ cmd->transceiver = XCVR_INTERNAL;
|
||||
+ cmd->autoneg = AUTONEG_DISABLE;
|
||||
}
|
||||
|
||||
- cmd->supported = SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE;
|
||||
- cmd->advertising = cmd->supported;
|
||||
- ethtool_cmd_speed_set(cmd, SPEED_10000);
|
||||
- cmd->duplex = DUPLEX_FULL;
|
||||
- cmd->port = PORT_FIBRE;
|
||||
- cmd->transceiver = XCVR_EXTERNAL;
|
||||
- cmd->autoneg = AUTONEG_DISABLE;
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
583
debian/patches/features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-support.patch
vendored
Normal file
583
debian/patches/features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-support.patch
vendored
Normal file
|
|
@ -0,0 +1,583 @@
|
|||
From 30bf224d12eb84225e3c0dcdd520cf9a23276f11 Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Mon, 13 Oct 2014 17:05:34 -0700
|
||||
Subject: [PATCH 05/11] drivers: net: xgene: Add SGMII based 1GbE support
|
||||
Origin: https://git.kernel.org/linus/32f784b50e14c653ad0f010fbd5921a5f8caf846
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/ethernet/apm/xgene/Makefile | 2 +-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 3 +
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 10 +-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 10 +
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 389 ++++++++++++++++++++++
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h | 41 +++
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 3 -
|
||||
7 files changed, 453 insertions(+), 5 deletions(-)
|
||||
create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
|
||||
create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
|
||||
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/Makefile b/drivers/net/ethernet/apm/xgene/Makefile
|
||||
index 589b352..68be5655 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/Makefile
|
||||
+++ b/drivers/net/ethernet/apm/xgene/Makefile
|
||||
@@ -2,6 +2,6 @@
|
||||
# Makefile for APM X-Gene Ethernet Driver.
|
||||
#
|
||||
|
||||
-xgene-enet-objs := xgene_enet_hw.o xgene_enet_xgmac.o \
|
||||
+xgene-enet-objs := xgene_enet_hw.o xgene_enet_sgmac.o xgene_enet_xgmac.o \
|
||||
xgene_enet_main.o xgene_enet_ethtool.o
|
||||
obj-$(CONFIG_NET_XGENE) += xgene-enet.o
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
index 2efc4d9..3855858 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
@@ -44,6 +44,7 @@ static inline u32 xgene_get_bits(u32 val, u32 start, u32 end)
|
||||
|
||||
enum xgene_enet_rm {
|
||||
RM0,
|
||||
+ RM1,
|
||||
RM3 = 3
|
||||
};
|
||||
|
||||
@@ -143,6 +144,8 @@ enum xgene_enet_rm {
|
||||
#define CFG_CLE_FPSEL0_SET(dst, val) xgene_set_bits(dst, val, 16, 4)
|
||||
#define CFG_MACMODE_SET(dst, val) xgene_set_bits(dst, val, 18, 2)
|
||||
#define CFG_WAITASYNCRD_SET(dst, val) xgene_set_bits(dst, val, 0, 16)
|
||||
+#define CFG_CLE_DSTQID0(val) (val & GENMASK(11, 0))
|
||||
+#define CFG_CLE_FPSEL0(val) ((val << 16) & GENMASK(19, 16))
|
||||
#define ICM_CONFIG0_REG_0_ADDR 0x0400
|
||||
#define ICM_CONFIG2_REG_0_ADDR 0x0410
|
||||
#define RX_DV_GATE_REG_0_ADDR 0x05fc
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
index 9e251ec..3c208cc 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include "xgene_enet_main.h"
|
||||
#include "xgene_enet_hw.h"
|
||||
+#include "xgene_enet_sgmac.h"
|
||||
#include "xgene_enet_xgmac.h"
|
||||
|
||||
static void xgene_enet_init_bufpool(struct xgene_enet_desc_ring *buf_pool)
|
||||
@@ -813,6 +814,7 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
|
||||
return pdata->phy_mode;
|
||||
}
|
||||
if (pdata->phy_mode != PHY_INTERFACE_MODE_RGMII &&
|
||||
+ pdata->phy_mode != PHY_INTERFACE_MODE_SGMII &&
|
||||
pdata->phy_mode != PHY_INTERFACE_MODE_XGMII) {
|
||||
dev_err(dev, "Incorrect phy-connection-type specified\n");
|
||||
return -ENODEV;
|
||||
@@ -830,7 +832,8 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
|
||||
pdata->eth_csr_addr = base_addr + BLOCK_ETH_CSR_OFFSET;
|
||||
pdata->eth_ring_if_addr = base_addr + BLOCK_ETH_RING_IF_OFFSET;
|
||||
pdata->eth_diag_csr_addr = base_addr + BLOCK_ETH_DIAG_CSR_OFFSET;
|
||||
- if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
|
||||
+ if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII ||
|
||||
+ pdata->phy_mode == PHY_INTERFACE_MODE_SGMII) {
|
||||
pdata->mcx_mac_addr = base_addr + BLOCK_ETH_MAC_OFFSET;
|
||||
pdata->mcx_mac_csr_addr = base_addr + BLOCK_ETH_MAC_CSR_OFFSET;
|
||||
} else {
|
||||
@@ -881,6 +884,11 @@ static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
|
||||
pdata->port_ops = &xgene_gport_ops;
|
||||
pdata->rm = RM3;
|
||||
break;
|
||||
+ case PHY_INTERFACE_MODE_SGMII:
|
||||
+ pdata->mac_ops = &xgene_sgmac_ops;
|
||||
+ pdata->port_ops = &xgene_sgport_ops;
|
||||
+ pdata->rm = RM1;
|
||||
+ break;
|
||||
default:
|
||||
pdata->mac_ops = &xgene_xgmac_ops;
|
||||
pdata->port_ops = &xgene_xgport_ops;
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
index 10b03a1..874e5a0 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
@@ -39,6 +39,9 @@
|
||||
#define NUM_PKT_BUF 64
|
||||
#define NUM_BUFPOOL 32
|
||||
|
||||
+#define PHY_POLL_LINK_ON (10 * HZ)
|
||||
+#define PHY_POLL_LINK_OFF (PHY_POLL_LINK_ON / 5)
|
||||
+
|
||||
/* software context of a descriptor ring */
|
||||
struct xgene_enet_desc_ring {
|
||||
struct net_device *ndev;
|
||||
@@ -118,6 +121,13 @@ struct xgene_enet_pdata {
|
||||
struct delayed_work link_work;
|
||||
};
|
||||
|
||||
+struct xgene_indirect_ctl {
|
||||
+ void __iomem *addr;
|
||||
+ void __iomem *ctl;
|
||||
+ void __iomem *cmd;
|
||||
+ void __iomem *cmd_done;
|
||||
+};
|
||||
+
|
||||
/* Set the specified value into a bit-field defined by its starting position
|
||||
* and length within a single u64.
|
||||
*/
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
|
||||
new file mode 100644
|
||||
index 0000000..e6d24c2
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
|
||||
@@ -0,0 +1,389 @@
|
||||
+/* Applied Micro X-Gene SoC Ethernet Driver
|
||||
+ *
|
||||
+ * Copyright (c) 2014, Applied Micro Circuits Corporation
|
||||
+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
|
||||
+ * Keyur Chudgar <kchudgar@apm.com>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License as published by the
|
||||
+ * Free Software Foundation; either version 2 of the License, or (at your
|
||||
+ * option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
+#include "xgene_enet_main.h"
|
||||
+#include "xgene_enet_hw.h"
|
||||
+#include "xgene_enet_sgmac.h"
|
||||
+
|
||||
+static void xgene_enet_wr_csr(struct xgene_enet_pdata *p, u32 offset, u32 val)
|
||||
+{
|
||||
+ iowrite32(val, p->eth_csr_addr + offset);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_wr_ring_if(struct xgene_enet_pdata *p,
|
||||
+ u32 offset, u32 val)
|
||||
+{
|
||||
+ iowrite32(val, p->eth_ring_if_addr + offset);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_wr_diag_csr(struct xgene_enet_pdata *p,
|
||||
+ u32 offset, u32 val)
|
||||
+{
|
||||
+ iowrite32(val, p->eth_diag_csr_addr + offset);
|
||||
+}
|
||||
+
|
||||
+static bool xgene_enet_wr_indirect(struct xgene_indirect_ctl *ctl,
|
||||
+ u32 wr_addr, u32 wr_data)
|
||||
+{
|
||||
+ int i;
|
||||
+
|
||||
+ iowrite32(wr_addr, ctl->addr);
|
||||
+ iowrite32(wr_data, ctl->ctl);
|
||||
+ iowrite32(XGENE_ENET_WR_CMD, ctl->cmd);
|
||||
+
|
||||
+ /* wait for write command to complete */
|
||||
+ for (i = 0; i < 10; i++) {
|
||||
+ if (ioread32(ctl->cmd_done)) {
|
||||
+ iowrite32(0, ctl->cmd);
|
||||
+ return true;
|
||||
+ }
|
||||
+ udelay(1);
|
||||
+ }
|
||||
+
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_wr_mac(struct xgene_enet_pdata *p,
|
||||
+ u32 wr_addr, u32 wr_data)
|
||||
+{
|
||||
+ struct xgene_indirect_ctl ctl = {
|
||||
+ .addr = p->mcx_mac_addr + MAC_ADDR_REG_OFFSET,
|
||||
+ .ctl = p->mcx_mac_addr + MAC_WRITE_REG_OFFSET,
|
||||
+ .cmd = p->mcx_mac_addr + MAC_COMMAND_REG_OFFSET,
|
||||
+ .cmd_done = p->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET
|
||||
+ };
|
||||
+
|
||||
+ if (!xgene_enet_wr_indirect(&ctl, wr_addr, wr_data))
|
||||
+ netdev_err(p->ndev, "mac write failed, addr: %04x\n", wr_addr);
|
||||
+}
|
||||
+
|
||||
+static u32 xgene_enet_rd_csr(struct xgene_enet_pdata *p, u32 offset)
|
||||
+{
|
||||
+ return ioread32(p->eth_csr_addr + offset);
|
||||
+}
|
||||
+
|
||||
+static u32 xgene_enet_rd_diag_csr(struct xgene_enet_pdata *p, u32 offset)
|
||||
+{
|
||||
+ return ioread32(p->eth_diag_csr_addr + offset);
|
||||
+}
|
||||
+
|
||||
+static u32 xgene_enet_rd_indirect(struct xgene_indirect_ctl *ctl, u32 rd_addr)
|
||||
+{
|
||||
+ u32 rd_data;
|
||||
+ int i;
|
||||
+
|
||||
+ iowrite32(rd_addr, ctl->addr);
|
||||
+ iowrite32(XGENE_ENET_RD_CMD, ctl->cmd);
|
||||
+
|
||||
+ /* wait for read command to complete */
|
||||
+ for (i = 0; i < 10; i++) {
|
||||
+ if (ioread32(ctl->cmd_done)) {
|
||||
+ rd_data = ioread32(ctl->ctl);
|
||||
+ iowrite32(0, ctl->cmd);
|
||||
+
|
||||
+ return rd_data;
|
||||
+ }
|
||||
+ udelay(1);
|
||||
+ }
|
||||
+
|
||||
+ pr_err("%s: mac read failed, addr: %04x\n", __func__, rd_addr);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static u32 xgene_enet_rd_mac(struct xgene_enet_pdata *p, u32 rd_addr)
|
||||
+{
|
||||
+ struct xgene_indirect_ctl ctl = {
|
||||
+ .addr = p->mcx_mac_addr + MAC_ADDR_REG_OFFSET,
|
||||
+ .ctl = p->mcx_mac_addr + MAC_READ_REG_OFFSET,
|
||||
+ .cmd = p->mcx_mac_addr + MAC_COMMAND_REG_OFFSET,
|
||||
+ .cmd_done = p->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET
|
||||
+ };
|
||||
+
|
||||
+ return xgene_enet_rd_indirect(&ctl, rd_addr);
|
||||
+}
|
||||
+
|
||||
+static int xgene_enet_ecc_init(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ struct net_device *ndev = p->ndev;
|
||||
+ u32 data;
|
||||
+ int i;
|
||||
+
|
||||
+ xgene_enet_wr_diag_csr(p, ENET_CFG_MEM_RAM_SHUTDOWN_ADDR, 0);
|
||||
+ for (i = 0; i < 10 && data != ~0U ; i++) {
|
||||
+ usleep_range(100, 110);
|
||||
+ data = xgene_enet_rd_diag_csr(p, ENET_BLOCK_MEM_RDY_ADDR);
|
||||
+ }
|
||||
+
|
||||
+ if (data != ~0U) {
|
||||
+ netdev_err(ndev, "Failed to release memory from shutdown\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ u32 val = 0xffffffff;
|
||||
+
|
||||
+ xgene_enet_wr_ring_if(p, ENET_CFGSSQMIWQASSOC_ADDR, val);
|
||||
+ xgene_enet_wr_ring_if(p, ENET_CFGSSQMIFPQASSOC_ADDR, val);
|
||||
+}
|
||||
+
|
||||
+static void xgene_mii_phy_write(struct xgene_enet_pdata *p, u8 phy_id,
|
||||
+ u32 reg, u16 data)
|
||||
+{
|
||||
+ u32 addr, wr_data, done;
|
||||
+ int i;
|
||||
+
|
||||
+ addr = PHY_ADDR(phy_id) | REG_ADDR(reg);
|
||||
+ xgene_enet_wr_mac(p, MII_MGMT_ADDRESS_ADDR, addr);
|
||||
+
|
||||
+ wr_data = PHY_CONTROL(data);
|
||||
+ xgene_enet_wr_mac(p, MII_MGMT_CONTROL_ADDR, wr_data);
|
||||
+
|
||||
+ for (i = 0; i < 10; i++) {
|
||||
+ done = xgene_enet_rd_mac(p, MII_MGMT_INDICATORS_ADDR);
|
||||
+ if (!(done & BUSY_MASK))
|
||||
+ return;
|
||||
+ usleep_range(10, 20);
|
||||
+ }
|
||||
+
|
||||
+ netdev_err(p->ndev, "MII_MGMT write failed\n");
|
||||
+}
|
||||
+
|
||||
+static u32 xgene_mii_phy_read(struct xgene_enet_pdata *p, u8 phy_id, u32 reg)
|
||||
+{
|
||||
+ u32 addr, data, done;
|
||||
+ int i;
|
||||
+
|
||||
+ addr = PHY_ADDR(phy_id) | REG_ADDR(reg);
|
||||
+ xgene_enet_wr_mac(p, MII_MGMT_ADDRESS_ADDR, addr);
|
||||
+ xgene_enet_wr_mac(p, MII_MGMT_COMMAND_ADDR, READ_CYCLE_MASK);
|
||||
+
|
||||
+ for (i = 0; i < 10; i++) {
|
||||
+ done = xgene_enet_rd_mac(p, MII_MGMT_INDICATORS_ADDR);
|
||||
+ if (!(done & BUSY_MASK)) {
|
||||
+ data = xgene_enet_rd_mac(p, MII_MGMT_STATUS_ADDR);
|
||||
+ xgene_enet_wr_mac(p, MII_MGMT_COMMAND_ADDR, 0);
|
||||
+
|
||||
+ return data;
|
||||
+ }
|
||||
+ usleep_range(10, 20);
|
||||
+ }
|
||||
+
|
||||
+ netdev_err(p->ndev, "MII_MGMT read failed\n");
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void xgene_sgmac_reset(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ xgene_enet_wr_mac(p, MAC_CONFIG_1_ADDR, SOFT_RESET1);
|
||||
+ xgene_enet_wr_mac(p, MAC_CONFIG_1_ADDR, 0);
|
||||
+}
|
||||
+
|
||||
+static void xgene_sgmac_set_mac_addr(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ u32 addr0, addr1;
|
||||
+ u8 *dev_addr = p->ndev->dev_addr;
|
||||
+
|
||||
+ addr0 = (dev_addr[3] << 24) | (dev_addr[2] << 16) |
|
||||
+ (dev_addr[1] << 8) | dev_addr[0];
|
||||
+ xgene_enet_wr_mac(p, STATION_ADDR0_ADDR, addr0);
|
||||
+
|
||||
+ addr1 = xgene_enet_rd_mac(p, STATION_ADDR1_ADDR);
|
||||
+ addr1 |= (dev_addr[5] << 24) | (dev_addr[4] << 16);
|
||||
+ xgene_enet_wr_mac(p, STATION_ADDR1_ADDR, addr1);
|
||||
+}
|
||||
+
|
||||
+static u32 xgene_enet_link_status(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ u32 data;
|
||||
+
|
||||
+ data = xgene_mii_phy_read(p, INT_PHY_ADDR,
|
||||
+ SGMII_BASE_PAGE_ABILITY_ADDR >> 2);
|
||||
+
|
||||
+ return data & LINK_UP;
|
||||
+}
|
||||
+
|
||||
+static void xgene_sgmac_init(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ u32 data, loop = 10;
|
||||
+
|
||||
+ xgene_sgmac_reset(p);
|
||||
+
|
||||
+ /* Enable auto-negotiation */
|
||||
+ xgene_mii_phy_write(p, INT_PHY_ADDR, SGMII_CONTROL_ADDR >> 2, 0x1000);
|
||||
+ xgene_mii_phy_write(p, INT_PHY_ADDR, SGMII_TBI_CONTROL_ADDR >> 2, 0);
|
||||
+
|
||||
+ while (loop--) {
|
||||
+ data = xgene_mii_phy_read(p, INT_PHY_ADDR,
|
||||
+ SGMII_STATUS_ADDR >> 2);
|
||||
+ if ((data & AUTO_NEG_COMPLETE) && (data & LINK_STATUS))
|
||||
+ break;
|
||||
+ usleep_range(10, 20);
|
||||
+ }
|
||||
+ if (!(data & AUTO_NEG_COMPLETE) || !(data & LINK_STATUS))
|
||||
+ netdev_err(p->ndev, "Auto-negotiation failed\n");
|
||||
+
|
||||
+ data = xgene_enet_rd_mac(p, MAC_CONFIG_2_ADDR);
|
||||
+ ENET_INTERFACE_MODE2_SET(&data, 2);
|
||||
+ xgene_enet_wr_mac(p, MAC_CONFIG_2_ADDR, data | FULL_DUPLEX2);
|
||||
+ xgene_enet_wr_mac(p, INTERFACE_CONTROL_ADDR, ENET_GHD_MODE);
|
||||
+
|
||||
+ data = xgene_enet_rd_csr(p, ENET_SPARE_CFG_REG_ADDR);
|
||||
+ data |= MPA_IDLE_WITH_QMI_EMPTY;
|
||||
+ xgene_enet_wr_csr(p, ENET_SPARE_CFG_REG_ADDR, data);
|
||||
+
|
||||
+ xgene_sgmac_set_mac_addr(p);
|
||||
+
|
||||
+ data = xgene_enet_rd_csr(p, DEBUG_REG_ADDR);
|
||||
+ data |= CFG_BYPASS_UNISEC_TX | CFG_BYPASS_UNISEC_RX;
|
||||
+ xgene_enet_wr_csr(p, DEBUG_REG_ADDR, data);
|
||||
+
|
||||
+ /* Adjust MDC clock frequency */
|
||||
+ data = xgene_enet_rd_mac(p, MII_MGMT_CONFIG_ADDR);
|
||||
+ MGMT_CLOCK_SEL_SET(&data, 7);
|
||||
+ xgene_enet_wr_mac(p, MII_MGMT_CONFIG_ADDR, data);
|
||||
+
|
||||
+ /* Enable drop if bufpool not available */
|
||||
+ data = xgene_enet_rd_csr(p, RSIF_CONFIG_REG_ADDR);
|
||||
+ data |= CFG_RSIF_FPBUFF_TIMEOUT_EN;
|
||||
+ xgene_enet_wr_csr(p, RSIF_CONFIG_REG_ADDR, data);
|
||||
+
|
||||
+ /* Rtype should be copied from FP */
|
||||
+ xgene_enet_wr_csr(p, RSIF_RAM_DBG_REG0_ADDR, 0);
|
||||
+
|
||||
+ /* Bypass traffic gating */
|
||||
+ xgene_enet_wr_csr(p, CFG_LINK_AGGR_RESUME_0_ADDR, TX_PORT0);
|
||||
+ xgene_enet_wr_csr(p, CFG_BYPASS_ADDR, RESUME_TX);
|
||||
+ xgene_enet_wr_csr(p, SG_RX_DV_GATE_REG_0_ADDR, RESUME_RX0);
|
||||
+}
|
||||
+
|
||||
+static void xgene_sgmac_rxtx(struct xgene_enet_pdata *p, u32 bits, bool set)
|
||||
+{
|
||||
+ u32 data;
|
||||
+
|
||||
+ data = xgene_enet_rd_mac(p, MAC_CONFIG_1_ADDR);
|
||||
+
|
||||
+ if (set)
|
||||
+ data |= bits;
|
||||
+ else
|
||||
+ data &= ~bits;
|
||||
+
|
||||
+ xgene_enet_wr_mac(p, MAC_CONFIG_1_ADDR, data);
|
||||
+}
|
||||
+
|
||||
+static void xgene_sgmac_rx_enable(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ xgene_sgmac_rxtx(p, RX_EN, true);
|
||||
+}
|
||||
+
|
||||
+static void xgene_sgmac_tx_enable(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ xgene_sgmac_rxtx(p, TX_EN, true);
|
||||
+}
|
||||
+
|
||||
+static void xgene_sgmac_rx_disable(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ xgene_sgmac_rxtx(p, RX_EN, false);
|
||||
+}
|
||||
+
|
||||
+static void xgene_sgmac_tx_disable(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ xgene_sgmac_rxtx(p, TX_EN, false);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_reset(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ clk_prepare_enable(p->clk);
|
||||
+ clk_disable_unprepare(p->clk);
|
||||
+ clk_prepare_enable(p->clk);
|
||||
+
|
||||
+ xgene_enet_ecc_init(p);
|
||||
+ xgene_enet_config_ring_if_assoc(p);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_cle_bypass(struct xgene_enet_pdata *p,
|
||||
+ u32 dst_ring_num, u16 bufpool_id)
|
||||
+{
|
||||
+ u32 data, fpsel;
|
||||
+
|
||||
+ data = CFG_CLE_BYPASS_EN0;
|
||||
+ xgene_enet_wr_csr(p, CLE_BYPASS_REG0_0_ADDR, data);
|
||||
+
|
||||
+ fpsel = xgene_enet_ring_bufnum(bufpool_id) - 0x20;
|
||||
+ data = CFG_CLE_DSTQID0(dst_ring_num) | CFG_CLE_FPSEL0(fpsel);
|
||||
+ xgene_enet_wr_csr(p, CLE_BYPASS_REG1_0_ADDR, data);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_shutdown(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ clk_disable_unprepare(p->clk);
|
||||
+}
|
||||
+
|
||||
+static void xgene_enet_link_state(struct work_struct *work)
|
||||
+{
|
||||
+ struct xgene_enet_pdata *p = container_of(to_delayed_work(work),
|
||||
+ struct xgene_enet_pdata, link_work);
|
||||
+ struct net_device *ndev = p->ndev;
|
||||
+ u32 link, poll_interval;
|
||||
+
|
||||
+ link = xgene_enet_link_status(p);
|
||||
+ if (link) {
|
||||
+ if (!netif_carrier_ok(ndev)) {
|
||||
+ netif_carrier_on(ndev);
|
||||
+ xgene_sgmac_init(p);
|
||||
+ xgene_sgmac_rx_enable(p);
|
||||
+ xgene_sgmac_tx_enable(p);
|
||||
+ netdev_info(ndev, "Link is Up - 1Gbps\n");
|
||||
+ }
|
||||
+ poll_interval = PHY_POLL_LINK_ON;
|
||||
+ } else {
|
||||
+ if (netif_carrier_ok(ndev)) {
|
||||
+ xgene_sgmac_rx_disable(p);
|
||||
+ xgene_sgmac_tx_disable(p);
|
||||
+ netif_carrier_off(ndev);
|
||||
+ netdev_info(ndev, "Link is Down\n");
|
||||
+ }
|
||||
+ poll_interval = PHY_POLL_LINK_OFF;
|
||||
+ }
|
||||
+
|
||||
+ schedule_delayed_work(&p->link_work, poll_interval);
|
||||
+}
|
||||
+
|
||||
+struct xgene_mac_ops xgene_sgmac_ops = {
|
||||
+ .init = xgene_sgmac_init,
|
||||
+ .reset = xgene_sgmac_reset,
|
||||
+ .rx_enable = xgene_sgmac_rx_enable,
|
||||
+ .tx_enable = xgene_sgmac_tx_enable,
|
||||
+ .rx_disable = xgene_sgmac_rx_disable,
|
||||
+ .tx_disable = xgene_sgmac_tx_disable,
|
||||
+ .set_mac_addr = xgene_sgmac_set_mac_addr,
|
||||
+ .link_state = xgene_enet_link_state
|
||||
+};
|
||||
+
|
||||
+struct xgene_port_ops xgene_sgport_ops = {
|
||||
+ .reset = xgene_enet_reset,
|
||||
+ .cle_bypass = xgene_enet_cle_bypass,
|
||||
+ .shutdown = xgene_enet_shutdown
|
||||
+};
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
|
||||
new file mode 100644
|
||||
index 0000000..de43246
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h
|
||||
@@ -0,0 +1,41 @@
|
||||
+/* Applied Micro X-Gene SoC Ethernet Driver
|
||||
+ *
|
||||
+ * Copyright (c) 2014, Applied Micro Circuits Corporation
|
||||
+ * Authors: Iyappan Subramanian <isubramanian@apm.com>
|
||||
+ * Keyur Chudgar <kchudgar@apm.com>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License as published by the
|
||||
+ * Free Software Foundation; either version 2 of the License, or (at your
|
||||
+ * option) any later version.
|
||||
+ *
|
||||
+ * This program is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
+#ifndef __XGENE_ENET_SGMAC_H__
|
||||
+#define __XGENE_ENET_SGMAC_H__
|
||||
+
|
||||
+#define PHY_ADDR(src) (((src)<<8) & GENMASK(12, 8))
|
||||
+#define REG_ADDR(src) ((src) & GENMASK(4, 0))
|
||||
+#define PHY_CONTROL(src) ((src) & GENMASK(15, 0))
|
||||
+#define INT_PHY_ADDR 0x1e
|
||||
+#define SGMII_TBI_CONTROL_ADDR 0x44
|
||||
+#define SGMII_CONTROL_ADDR 0x00
|
||||
+#define SGMII_STATUS_ADDR 0x04
|
||||
+#define SGMII_BASE_PAGE_ABILITY_ADDR 0x14
|
||||
+#define AUTO_NEG_COMPLETE BIT(5)
|
||||
+#define LINK_STATUS BIT(2)
|
||||
+#define LINK_UP BIT(15)
|
||||
+#define MPA_IDLE_WITH_QMI_EMPTY BIT(12)
|
||||
+#define SG_RX_DV_GATE_REG_0_ADDR 0x0dfc
|
||||
+
|
||||
+extern struct xgene_mac_ops xgene_sgmac_ops;
|
||||
+extern struct xgene_port_ops xgene_sgport_ops;
|
||||
+
|
||||
+#endif /* __XGENE_ENET_SGMAC_H__ */
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
|
||||
index dcb2087..5a5296a 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
|
||||
@@ -47,9 +47,6 @@
|
||||
#define XG_ENET_SPARE_CFG_REG_1_ADDR 0x0410
|
||||
#define XGENET_RX_DV_GATE_REG_0_ADDR 0x0804
|
||||
|
||||
-#define PHY_POLL_LINK_ON (10 * HZ)
|
||||
-#define PHY_POLL_LINK_OFF (PHY_POLL_LINK_ON / 5)
|
||||
-
|
||||
extern struct xgene_mac_ops xgene_xgmac_ops;
|
||||
extern struct xgene_port_ops xgene_xgport_ops;
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
175
debian/patches/features/arm64/drivers-net-xgene-Backward-compatibility-with-older-.patch
vendored
Normal file
175
debian/patches/features/arm64/drivers-net-xgene-Backward-compatibility-with-older-.patch
vendored
Normal file
|
|
@ -0,0 +1,175 @@
|
|||
From 092e35e5b10fdea2d814aa96ab2c2f2aad477640 Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Mon, 3 Nov 2014 11:59:55 -0800
|
||||
Subject: [PATCH 08/11] drivers: net: xgene: Backward compatibility with older
|
||||
firmware
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/commit/?id=c3f4465d272fa94d5a077c502e83d3e712ec8d62
|
||||
|
||||
This patch adds support when used with older firmware (<= 1.13.28).
|
||||
|
||||
- Added xgene_ring_mgr_init() to check whether ring manager is initialized
|
||||
- Calling xgene_ring_mgr_init() from xgene_port_ops.reset()
|
||||
- To handle errors, changed the return type of xgene_port_ops.reset()
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 18 +++++++++++++++++-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 4 ++++
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 5 ++++-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 +-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 7 ++++++-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 7 ++++++-
|
||||
6 files changed, 38 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
|
||||
index 63ea194..7ba83ff 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
|
||||
@@ -575,10 +575,24 @@ static void xgene_gmac_tx_disable(struct xgene_enet_pdata *pdata)
|
||||
xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, data & ~TX_EN);
|
||||
}
|
||||
|
||||
-static void xgene_enet_reset(struct xgene_enet_pdata *pdata)
|
||||
+bool xgene_ring_mgr_init(struct xgene_enet_pdata *p)
|
||||
+{
|
||||
+ if (!ioread32(p->ring_csr_addr + CLKEN_ADDR))
|
||||
+ return false;
|
||||
+
|
||||
+ if (ioread32(p->ring_csr_addr + SRST_ADDR))
|
||||
+ return false;
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+static int xgene_enet_reset(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
+ if (!xgene_ring_mgr_init(pdata))
|
||||
+ return -ENODEV;
|
||||
+
|
||||
clk_prepare_enable(pdata->clk);
|
||||
clk_disable_unprepare(pdata->clk);
|
||||
clk_prepare_enable(pdata->clk);
|
||||
@@ -590,6 +604,8 @@ static void xgene_enet_reset(struct xgene_enet_pdata *pdata)
|
||||
val |= SCAN_AUTO_INCR;
|
||||
MGMT_CLOCK_SEL_SET(&val, 1);
|
||||
xgene_enet_wr_mcx_mac(pdata, MII_MGMT_CONFIG_ADDR, val);
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static void xgene_gport_shutdown(struct xgene_enet_pdata *pdata)
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
index 3855858..ec45f32 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
@@ -104,6 +104,9 @@ enum xgene_enet_rm {
|
||||
#define BLOCK_ETH_MAC_OFFSET 0x0000
|
||||
#define BLOCK_ETH_MAC_CSR_OFFSET 0x2800
|
||||
|
||||
+#define CLKEN_ADDR 0xc208
|
||||
+#define SRST_ADDR 0xc200
|
||||
+
|
||||
#define MAC_ADDR_REG_OFFSET 0x00
|
||||
#define MAC_COMMAND_REG_OFFSET 0x04
|
||||
#define MAC_WRITE_REG_OFFSET 0x08
|
||||
@@ -318,6 +321,7 @@ void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,
|
||||
|
||||
int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata);
|
||||
void xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata);
|
||||
+bool xgene_ring_mgr_init(struct xgene_enet_pdata *p);
|
||||
|
||||
extern struct xgene_mac_ops xgene_gmac_ops;
|
||||
extern struct xgene_port_ops xgene_gport_ops;
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
index 3c208cc..cc3f955 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
@@ -852,7 +852,9 @@ static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata)
|
||||
u16 dst_ring_num;
|
||||
int ret;
|
||||
|
||||
- pdata->port_ops->reset(pdata);
|
||||
+ ret = pdata->port_ops->reset(pdata);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
|
||||
ret = xgene_enet_create_desc_rings(ndev);
|
||||
if (ret) {
|
||||
@@ -954,6 +956,7 @@ static int xgene_enet_probe(struct platform_device *pdev)
|
||||
|
||||
return ret;
|
||||
err:
|
||||
+ unregister_netdev(ndev);
|
||||
free_netdev(ndev);
|
||||
return ret;
|
||||
}
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
index 874e5a0..dba647d 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
@@ -83,7 +83,7 @@ struct xgene_mac_ops {
|
||||
};
|
||||
|
||||
struct xgene_port_ops {
|
||||
- void (*reset)(struct xgene_enet_pdata *pdata);
|
||||
+ int (*reset)(struct xgene_enet_pdata *pdata);
|
||||
void (*cle_bypass)(struct xgene_enet_pdata *pdata,
|
||||
u32 dst_ring_num, u16 bufpool_id);
|
||||
void (*shutdown)(struct xgene_enet_pdata *pdata);
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
|
||||
index c22f326..f5d4f68 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
|
||||
@@ -311,14 +311,19 @@ static void xgene_sgmac_tx_disable(struct xgene_enet_pdata *p)
|
||||
xgene_sgmac_rxtx(p, TX_EN, false);
|
||||
}
|
||||
|
||||
-static void xgene_enet_reset(struct xgene_enet_pdata *p)
|
||||
+static int xgene_enet_reset(struct xgene_enet_pdata *p)
|
||||
{
|
||||
+ if (!xgene_ring_mgr_init(p))
|
||||
+ return -ENODEV;
|
||||
+
|
||||
clk_prepare_enable(p->clk);
|
||||
clk_disable_unprepare(p->clk);
|
||||
clk_prepare_enable(p->clk);
|
||||
|
||||
xgene_enet_ecc_init(p);
|
||||
xgene_enet_config_ring_if_assoc(p);
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static void xgene_enet_cle_bypass(struct xgene_enet_pdata *p,
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
|
||||
index 67d0720..a18a9d1 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
|
||||
@@ -252,14 +252,19 @@ static void xgene_xgmac_tx_disable(struct xgene_enet_pdata *pdata)
|
||||
xgene_enet_wr_mac(pdata, AXGMAC_CONFIG_1, data & ~HSTTFEN);
|
||||
}
|
||||
|
||||
-static void xgene_enet_reset(struct xgene_enet_pdata *pdata)
|
||||
+static int xgene_enet_reset(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
+ if (!xgene_ring_mgr_init(pdata))
|
||||
+ return -ENODEV;
|
||||
+
|
||||
clk_prepare_enable(pdata->clk);
|
||||
clk_disable_unprepare(pdata->clk);
|
||||
clk_prepare_enable(pdata->clk);
|
||||
|
||||
xgene_enet_ecc_init(pdata);
|
||||
xgene_enet_config_ring_if_assoc(pdata);
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static void xgene_enet_xgcle_bypass(struct xgene_enet_pdata *pdata,
|
||||
--
|
||||
2.1.0
|
||||
|
||||
353
debian/patches/features/arm64/drivers-net-xgene-Preparing-for-adding-10GbE-support.patch
vendored
Normal file
353
debian/patches/features/arm64/drivers-net-xgene-Preparing-for-adding-10GbE-support.patch
vendored
Normal file
|
|
@ -0,0 +1,353 @@
|
|||
From 33f8dba6cb5493b2fff26c43a6cc0321e0814732 Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Thu, 9 Oct 2014 18:32:05 -0700
|
||||
Subject: [PATCH 01/11] drivers: net: xgene: Preparing for adding 10GbE support
|
||||
Origin: https://git.kernel.org/linus/d0eb74582fa7b5c15710d293a3c4d8d3409ae165
|
||||
|
||||
- Rearranged code to pave the way for adding 10GbE support
|
||||
- Added mac_ops structure containing function pointers for mac specific functions
|
||||
- Added port_ops structure containing function pointers for port specific functions
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 44 ++++++++++++++++--------
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 16 ++-------
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 40 +++++++++++++--------
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 19 ++++++++++
|
||||
4 files changed, 78 insertions(+), 41 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
|
||||
index 812d8d6..c8f3824 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
|
||||
@@ -402,7 +402,7 @@ static int xgene_mii_phy_read(struct xgene_enet_pdata *pdata,
|
||||
return data;
|
||||
}
|
||||
|
||||
-void xgene_gmac_set_mac_addr(struct xgene_enet_pdata *pdata)
|
||||
+static void xgene_gmac_set_mac_addr(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
u32 addr0, addr1;
|
||||
u8 *dev_addr = pdata->ndev->dev_addr;
|
||||
@@ -436,13 +436,13 @@ static int xgene_enet_ecc_init(struct xgene_enet_pdata *pdata)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-void xgene_gmac_reset(struct xgene_enet_pdata *pdata)
|
||||
+static void xgene_gmac_reset(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, SOFT_RESET1);
|
||||
xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, 0);
|
||||
}
|
||||
|
||||
-void xgene_gmac_init(struct xgene_enet_pdata *pdata, int speed)
|
||||
+static void xgene_gmac_init(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
u32 value, mc2;
|
||||
u32 intf_ctl, rgmii;
|
||||
@@ -456,7 +456,7 @@ void xgene_gmac_init(struct xgene_enet_pdata *pdata, int speed)
|
||||
xgene_enet_rd_mcx_mac(pdata, INTERFACE_CONTROL_ADDR, &intf_ctl);
|
||||
xgene_enet_rd_csr(pdata, RGMII_REG_0_ADDR, &rgmii);
|
||||
|
||||
- switch (speed) {
|
||||
+ switch (pdata->phy_speed) {
|
||||
case SPEED_10:
|
||||
ENET_INTERFACE_MODE2_SET(&mc2, 1);
|
||||
CFG_MACMODE_SET(&icm0, 0);
|
||||
@@ -525,8 +525,8 @@ static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *pdata)
|
||||
xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIQMLITEFPQASSOC_ADDR, val);
|
||||
}
|
||||
|
||||
-void xgene_enet_cle_bypass(struct xgene_enet_pdata *pdata,
|
||||
- u32 dst_ring_num, u16 bufpool_id)
|
||||
+static void xgene_enet_cle_bypass(struct xgene_enet_pdata *pdata,
|
||||
+ u32 dst_ring_num, u16 bufpool_id)
|
||||
{
|
||||
u32 cb;
|
||||
u32 fpsel;
|
||||
@@ -544,7 +544,7 @@ void xgene_enet_cle_bypass(struct xgene_enet_pdata *pdata,
|
||||
xgene_enet_wr_csr(pdata, CLE_BYPASS_REG1_0_ADDR, cb);
|
||||
}
|
||||
|
||||
-void xgene_gmac_rx_enable(struct xgene_enet_pdata *pdata)
|
||||
+static void xgene_gmac_rx_enable(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
u32 data;
|
||||
|
||||
@@ -552,7 +552,7 @@ void xgene_gmac_rx_enable(struct xgene_enet_pdata *pdata)
|
||||
xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, data | RX_EN);
|
||||
}
|
||||
|
||||
-void xgene_gmac_tx_enable(struct xgene_enet_pdata *pdata)
|
||||
+static void xgene_gmac_tx_enable(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
u32 data;
|
||||
|
||||
@@ -560,7 +560,7 @@ void xgene_gmac_tx_enable(struct xgene_enet_pdata *pdata)
|
||||
xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, data | TX_EN);
|
||||
}
|
||||
|
||||
-void xgene_gmac_rx_disable(struct xgene_enet_pdata *pdata)
|
||||
+static void xgene_gmac_rx_disable(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
u32 data;
|
||||
|
||||
@@ -568,7 +568,7 @@ void xgene_gmac_rx_disable(struct xgene_enet_pdata *pdata)
|
||||
xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, data & ~RX_EN);
|
||||
}
|
||||
|
||||
-void xgene_gmac_tx_disable(struct xgene_enet_pdata *pdata)
|
||||
+static void xgene_gmac_tx_disable(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
u32 data;
|
||||
|
||||
@@ -576,7 +576,7 @@ void xgene_gmac_tx_disable(struct xgene_enet_pdata *pdata)
|
||||
xgene_enet_wr_mcx_mac(pdata, MAC_CONFIG_1_ADDR, data & ~TX_EN);
|
||||
}
|
||||
|
||||
-void xgene_enet_reset(struct xgene_enet_pdata *pdata)
|
||||
+static void xgene_enet_reset(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
@@ -593,7 +593,7 @@ void xgene_enet_reset(struct xgene_enet_pdata *pdata)
|
||||
xgene_enet_wr_mcx_mac(pdata, MII_MGMT_CONFIG_ADDR, val);
|
||||
}
|
||||
|
||||
-void xgene_gport_shutdown(struct xgene_enet_pdata *pdata)
|
||||
+static void xgene_gport_shutdown(struct xgene_enet_pdata *pdata)
|
||||
{
|
||||
clk_disable_unprepare(pdata->clk);
|
||||
}
|
||||
@@ -627,10 +627,10 @@ static void xgene_enet_adjust_link(struct net_device *ndev)
|
||||
|
||||
if (phydev->link) {
|
||||
if (pdata->phy_speed != phydev->speed) {
|
||||
- xgene_gmac_init(pdata, phydev->speed);
|
||||
+ pdata->phy_speed = phydev->speed;
|
||||
+ xgene_gmac_init(pdata);
|
||||
xgene_gmac_rx_enable(pdata);
|
||||
xgene_gmac_tx_enable(pdata);
|
||||
- pdata->phy_speed = phydev->speed;
|
||||
phy_print_status(phydev);
|
||||
}
|
||||
} else {
|
||||
@@ -726,3 +726,19 @@ void xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata)
|
||||
mdiobus_free(pdata->mdio_bus);
|
||||
pdata->mdio_bus = NULL;
|
||||
}
|
||||
+
|
||||
+struct xgene_mac_ops xgene_gmac_ops = {
|
||||
+ .init = xgene_gmac_init,
|
||||
+ .reset = xgene_gmac_reset,
|
||||
+ .rx_enable = xgene_gmac_rx_enable,
|
||||
+ .tx_enable = xgene_gmac_tx_enable,
|
||||
+ .rx_disable = xgene_gmac_rx_disable,
|
||||
+ .tx_disable = xgene_gmac_tx_disable,
|
||||
+ .set_mac_addr = xgene_gmac_set_mac_addr,
|
||||
+};
|
||||
+
|
||||
+struct xgene_port_ops xgene_gport_ops = {
|
||||
+ .reset = xgene_enet_reset,
|
||||
+ .cle_bypass = xgene_enet_cle_bypass,
|
||||
+ .shutdown = xgene_gport_shutdown,
|
||||
+};
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
index 371e7a5..084ac68 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
@@ -318,20 +318,10 @@ void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,
|
||||
struct xgene_enet_pdata *pdata,
|
||||
enum xgene_enet_err_code status);
|
||||
|
||||
-void xgene_enet_reset(struct xgene_enet_pdata *priv);
|
||||
-void xgene_gmac_reset(struct xgene_enet_pdata *priv);
|
||||
-void xgene_gmac_init(struct xgene_enet_pdata *priv, int speed);
|
||||
-void xgene_gmac_tx_enable(struct xgene_enet_pdata *priv);
|
||||
-void xgene_gmac_rx_enable(struct xgene_enet_pdata *priv);
|
||||
-void xgene_gmac_tx_disable(struct xgene_enet_pdata *priv);
|
||||
-void xgene_gmac_rx_disable(struct xgene_enet_pdata *priv);
|
||||
-void xgene_gmac_set_mac_addr(struct xgene_enet_pdata *pdata);
|
||||
-void xgene_enet_cle_bypass(struct xgene_enet_pdata *pdata,
|
||||
- u32 dst_ring_num, u16 bufpool_id);
|
||||
-void xgene_gport_shutdown(struct xgene_enet_pdata *priv);
|
||||
-void xgene_gmac_get_tx_stats(struct xgene_enet_pdata *pdata);
|
||||
-
|
||||
int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata);
|
||||
void xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata);
|
||||
|
||||
+extern struct xgene_mac_ops xgene_gmac_ops;
|
||||
+extern struct xgene_port_ops xgene_gport_ops;
|
||||
+
|
||||
#endif /* __XGENE_ENET_HW_H__ */
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
index e4222af..c432644 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
@@ -413,7 +413,7 @@ static void xgene_enet_timeout(struct net_device *ndev)
|
||||
{
|
||||
struct xgene_enet_pdata *pdata = netdev_priv(ndev);
|
||||
|
||||
- xgene_gmac_reset(pdata);
|
||||
+ pdata->mac_ops->reset(pdata);
|
||||
}
|
||||
|
||||
static int xgene_enet_register_irq(struct net_device *ndev)
|
||||
@@ -445,10 +445,11 @@ static void xgene_enet_free_irq(struct net_device *ndev)
|
||||
static int xgene_enet_open(struct net_device *ndev)
|
||||
{
|
||||
struct xgene_enet_pdata *pdata = netdev_priv(ndev);
|
||||
+ struct xgene_mac_ops *mac_ops = pdata->mac_ops;
|
||||
int ret;
|
||||
|
||||
- xgene_gmac_tx_enable(pdata);
|
||||
- xgene_gmac_rx_enable(pdata);
|
||||
+ mac_ops->tx_enable(pdata);
|
||||
+ mac_ops->rx_enable(pdata);
|
||||
|
||||
ret = xgene_enet_register_irq(ndev);
|
||||
if (ret)
|
||||
@@ -466,6 +467,7 @@ static int xgene_enet_open(struct net_device *ndev)
|
||||
static int xgene_enet_close(struct net_device *ndev)
|
||||
{
|
||||
struct xgene_enet_pdata *pdata = netdev_priv(ndev);
|
||||
+ struct xgene_mac_ops *mac_ops = pdata->mac_ops;
|
||||
|
||||
netif_stop_queue(ndev);
|
||||
|
||||
@@ -476,8 +478,8 @@ static int xgene_enet_close(struct net_device *ndev)
|
||||
xgene_enet_free_irq(ndev);
|
||||
xgene_enet_process_ring(pdata->rx_ring, -1);
|
||||
|
||||
- xgene_gmac_tx_disable(pdata);
|
||||
- xgene_gmac_rx_disable(pdata);
|
||||
+ mac_ops->tx_disable(pdata);
|
||||
+ mac_ops->rx_disable(pdata);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -724,7 +726,7 @@ static int xgene_enet_set_mac_address(struct net_device *ndev, void *addr)
|
||||
ret = eth_mac_addr(ndev, addr);
|
||||
if (ret)
|
||||
return ret;
|
||||
- xgene_gmac_set_mac_addr(pdata);
|
||||
+ pdata->mac_ops->set_mac_addr(pdata);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -834,8 +836,8 @@ static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata)
|
||||
u16 dst_ring_num;
|
||||
int ret;
|
||||
|
||||
- xgene_gmac_tx_disable(pdata);
|
||||
- xgene_gmac_rx_disable(pdata);
|
||||
+ pdata->mac_ops->tx_disable(pdata);
|
||||
+ pdata->mac_ops->rx_disable(pdata);
|
||||
|
||||
ret = xgene_enet_create_desc_rings(ndev);
|
||||
if (ret) {
|
||||
@@ -853,11 +855,17 @@ static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata)
|
||||
}
|
||||
|
||||
dst_ring_num = xgene_enet_dst_ring_num(pdata->rx_ring);
|
||||
- xgene_enet_cle_bypass(pdata, dst_ring_num, buf_pool->id);
|
||||
+ pdata->port_ops->cle_bypass(pdata, dst_ring_num, buf_pool->id);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
+static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
|
||||
+{
|
||||
+ pdata->mac_ops = &xgene_gmac_ops;
|
||||
+ pdata->port_ops = &xgene_gport_ops;
|
||||
+}
|
||||
+
|
||||
static int xgene_enet_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *ndev;
|
||||
@@ -886,8 +894,9 @@ static int xgene_enet_probe(struct platform_device *pdev)
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
- xgene_enet_reset(pdata);
|
||||
- xgene_gmac_init(pdata, SPEED_1000);
|
||||
+ xgene_enet_setup_ops(pdata);
|
||||
+ pdata->port_ops->reset(pdata);
|
||||
+ pdata->mac_ops->init(pdata);
|
||||
|
||||
ret = register_netdev(ndev);
|
||||
if (ret) {
|
||||
@@ -918,19 +927,21 @@ err:
|
||||
static int xgene_enet_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct xgene_enet_pdata *pdata;
|
||||
+ struct xgene_mac_ops *mac_ops;
|
||||
struct net_device *ndev;
|
||||
|
||||
pdata = platform_get_drvdata(pdev);
|
||||
+ mac_ops = pdata->mac_ops;
|
||||
ndev = pdata->ndev;
|
||||
|
||||
- xgene_gmac_rx_disable(pdata);
|
||||
- xgene_gmac_tx_disable(pdata);
|
||||
+ mac_ops->rx_disable(pdata);
|
||||
+ mac_ops->tx_disable(pdata);
|
||||
|
||||
netif_napi_del(&pdata->rx_ring->napi);
|
||||
xgene_enet_mdio_remove(pdata);
|
||||
xgene_enet_delete_desc_rings(pdata);
|
||||
unregister_netdev(ndev);
|
||||
- xgene_gport_shutdown(pdata);
|
||||
+ pdata->port_ops->shutdown(pdata);
|
||||
free_netdev(ndev);
|
||||
|
||||
return 0;
|
||||
@@ -956,5 +967,6 @@ module_platform_driver(xgene_enet_driver);
|
||||
|
||||
MODULE_DESCRIPTION("APM X-Gene SoC Ethernet driver");
|
||||
MODULE_VERSION(XGENE_DRV_VERSION);
|
||||
+MODULE_AUTHOR("Iyappan Subramanian <isubramanian@apm.com>");
|
||||
MODULE_AUTHOR("Keyur Chudgar <kchudgar@apm.com>");
|
||||
MODULE_LICENSE("GPL");
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
index 0815866..ac180f9 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
@@ -68,6 +68,23 @@ struct xgene_enet_desc_ring {
|
||||
};
|
||||
};
|
||||
|
||||
+struct xgene_mac_ops {
|
||||
+ void (*init)(struct xgene_enet_pdata *pdata);
|
||||
+ void (*reset)(struct xgene_enet_pdata *pdata);
|
||||
+ void (*tx_enable)(struct xgene_enet_pdata *pdata);
|
||||
+ void (*rx_enable)(struct xgene_enet_pdata *pdata);
|
||||
+ void (*tx_disable)(struct xgene_enet_pdata *pdata);
|
||||
+ void (*rx_disable)(struct xgene_enet_pdata *pdata);
|
||||
+ void (*set_mac_addr)(struct xgene_enet_pdata *pdata);
|
||||
+};
|
||||
+
|
||||
+struct xgene_port_ops {
|
||||
+ void (*reset)(struct xgene_enet_pdata *pdata);
|
||||
+ void (*cle_bypass)(struct xgene_enet_pdata *pdata,
|
||||
+ u32 dst_ring_num, u16 bufpool_id);
|
||||
+ void (*shutdown)(struct xgene_enet_pdata *pdata);
|
||||
+};
|
||||
+
|
||||
/* ethernet private data */
|
||||
struct xgene_enet_pdata {
|
||||
struct net_device *ndev;
|
||||
@@ -98,6 +115,8 @@ struct xgene_enet_pdata {
|
||||
u32 speed;
|
||||
u16 rm;
|
||||
struct rtnl_link_stats64 stats;
|
||||
+ struct xgene_mac_ops *mac_ops;
|
||||
+ struct xgene_port_ops *port_ops;
|
||||
};
|
||||
|
||||
/* Set the specified value into a bit-field defined by its starting position
|
||||
--
|
||||
2.1.0
|
||||
|
||||
153
debian/patches/features/arm64/drivers-net-xgene-Preparing-for-adding-SGMII-based-1.patch
vendored
Normal file
153
debian/patches/features/arm64/drivers-net-xgene-Preparing-for-adding-SGMII-based-1.patch
vendored
Normal file
|
|
@ -0,0 +1,153 @@
|
|||
From 0d0393191a19911ef523a4cba10bedb10bbf07dd Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Mon, 13 Oct 2014 17:05:33 -0700
|
||||
Subject: [PATCH 04/11] drivers: net: xgene: Preparing for adding SGMII based
|
||||
1GbE
|
||||
Origin: https://git.kernel.org/linus/dc8385f0c0f46ca18c1c8ab59c9f565dc7cfa6bf
|
||||
|
||||
- Added link_state function pointer to the xgene__mac_ops structure
|
||||
- Moved ring manager (pdata->rm) assignment to xgene_enet_setup_ops
|
||||
- Removed unused variable (pdata->phy_addr) and macro (FULL_DUPLEX)
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 1 -
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 1 -
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 8 +++++---
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 +-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 3 ++-
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 1 -
|
||||
6 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
|
||||
index c8f3824..63ea194 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
|
||||
@@ -410,7 +410,6 @@ static void xgene_gmac_set_mac_addr(struct xgene_enet_pdata *pdata)
|
||||
addr0 = (dev_addr[3] << 24) | (dev_addr[2] << 16) |
|
||||
(dev_addr[1] << 8) | dev_addr[0];
|
||||
addr1 = (dev_addr[5] << 24) | (dev_addr[4] << 16);
|
||||
- addr1 |= pdata->phy_addr & 0xFFFF;
|
||||
|
||||
xgene_enet_wr_mcx_mac(pdata, STATION_ADDR0_ADDR, addr0);
|
||||
xgene_enet_wr_mcx_mac(pdata, STATION_ADDR1_ADDR, addr1);
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
index 15ec426..2efc4d9 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
|
||||
@@ -179,7 +179,6 @@ enum xgene_enet_rm {
|
||||
#define TUND_ADDR 0x4a
|
||||
|
||||
#define TSO_IPPROTO_TCP 1
|
||||
-#define FULL_DUPLEX 2
|
||||
|
||||
#define USERINFO_POS 0
|
||||
#define USERINFO_LEN 32
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
index 9b85239..9e251ec 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
@@ -833,11 +833,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
|
||||
if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
|
||||
pdata->mcx_mac_addr = base_addr + BLOCK_ETH_MAC_OFFSET;
|
||||
pdata->mcx_mac_csr_addr = base_addr + BLOCK_ETH_MAC_CSR_OFFSET;
|
||||
- pdata->rm = RM3;
|
||||
} else {
|
||||
pdata->mcx_mac_addr = base_addr + BLOCK_AXG_MAC_OFFSET;
|
||||
pdata->mcx_mac_csr_addr = base_addr + BLOCK_AXG_MAC_CSR_OFFSET;
|
||||
- pdata->rm = RM0;
|
||||
}
|
||||
pdata->rx_buff_cnt = NUM_PKT_BUF;
|
||||
|
||||
@@ -881,10 +879,12 @@ static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
|
||||
case PHY_INTERFACE_MODE_RGMII:
|
||||
pdata->mac_ops = &xgene_gmac_ops;
|
||||
pdata->port_ops = &xgene_gport_ops;
|
||||
+ pdata->rm = RM3;
|
||||
break;
|
||||
default:
|
||||
pdata->mac_ops = &xgene_xgmac_ops;
|
||||
pdata->port_ops = &xgene_xgport_ops;
|
||||
+ pdata->rm = RM0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -895,6 +895,7 @@ static int xgene_enet_probe(struct platform_device *pdev)
|
||||
struct xgene_enet_pdata *pdata;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct napi_struct *napi;
|
||||
+ struct xgene_mac_ops *mac_ops;
|
||||
int ret;
|
||||
|
||||
ndev = alloc_etherdev(sizeof(struct xgene_enet_pdata));
|
||||
@@ -937,10 +938,11 @@ static int xgene_enet_probe(struct platform_device *pdev)
|
||||
|
||||
napi = &pdata->rx_ring->napi;
|
||||
netif_napi_add(ndev, napi, xgene_enet_napi, NAPI_POLL_WEIGHT);
|
||||
+ mac_ops = pdata->mac_ops;
|
||||
if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII)
|
||||
ret = xgene_enet_mdio_config(pdata);
|
||||
else
|
||||
- INIT_DELAYED_WORK(&pdata->link_work, xgene_enet_link_state);
|
||||
+ INIT_DELAYED_WORK(&pdata->link_work, mac_ops->link_state);
|
||||
|
||||
return ret;
|
||||
err:
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
index 86cf68b..10b03a1 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
@@ -76,6 +76,7 @@ struct xgene_mac_ops {
|
||||
void (*tx_disable)(struct xgene_enet_pdata *pdata);
|
||||
void (*rx_disable)(struct xgene_enet_pdata *pdata);
|
||||
void (*set_mac_addr)(struct xgene_enet_pdata *pdata);
|
||||
+ void (*link_state)(struct work_struct *work);
|
||||
};
|
||||
|
||||
struct xgene_port_ops {
|
||||
@@ -109,7 +110,6 @@ struct xgene_enet_pdata {
|
||||
void __iomem *base_addr;
|
||||
void __iomem *ring_csr_addr;
|
||||
void __iomem *ring_cmd_addr;
|
||||
- u32 phy_addr;
|
||||
int phy_mode;
|
||||
enum xgene_enet_rm rm;
|
||||
struct rtnl_link_stats64 stats;
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
|
||||
index cd64b9f..67d0720 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
|
||||
@@ -284,7 +284,7 @@ static void xgene_enet_shutdown(struct xgene_enet_pdata *pdata)
|
||||
clk_disable_unprepare(pdata->clk);
|
||||
}
|
||||
|
||||
-void xgene_enet_link_state(struct work_struct *work)
|
||||
+static void xgene_enet_link_state(struct work_struct *work)
|
||||
{
|
||||
struct xgene_enet_pdata *pdata = container_of(to_delayed_work(work),
|
||||
struct xgene_enet_pdata, link_work);
|
||||
@@ -322,6 +322,7 @@ struct xgene_mac_ops xgene_xgmac_ops = {
|
||||
.rx_disable = xgene_xgmac_rx_disable,
|
||||
.tx_disable = xgene_xgmac_tx_disable,
|
||||
.set_mac_addr = xgene_xgmac_set_mac_addr,
|
||||
+ .link_state = xgene_enet_link_state
|
||||
};
|
||||
|
||||
struct xgene_port_ops xgene_xgport_ops = {
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
|
||||
index d2d59e7..dcb2087 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
|
||||
@@ -50,7 +50,6 @@
|
||||
#define PHY_POLL_LINK_ON (10 * HZ)
|
||||
#define PHY_POLL_LINK_OFF (PHY_POLL_LINK_ON / 5)
|
||||
|
||||
-void xgene_enet_link_state(struct work_struct *work);
|
||||
extern struct xgene_mac_ops xgene_xgmac_ops;
|
||||
extern struct xgene_port_ops xgene_xgport_ops;
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
54
debian/patches/features/arm64/drivers-net-xgene-Rewrite-buggy-loop-in-xgene_enet_e.patch
vendored
Normal file
54
debian/patches/features/arm64/drivers-net-xgene-Rewrite-buggy-loop-in-xgene_enet_e.patch
vendored
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
From 9f2bc2c30d24987cff5edc43a3d8f89bef6ce12a Mon Sep 17 00:00:00 2001
|
||||
From: Geert Uytterhoeven <geert@linux-m68k.org>
|
||||
Date: Thu, 23 Oct 2014 10:25:53 +0200
|
||||
Subject: [PATCH 07/11] drivers: net: xgene: Rewrite buggy loop in
|
||||
xgene_enet_ecc_init()
|
||||
Origin: https://git.kernel.org/linus/b71e821de50f0ff92f10f33064ee1713e9014158
|
||||
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c: In function ‘xgene_enet_ecc_init’:
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c:126: warning: ‘data’ may be used uninitialized in this function
|
||||
|
||||
Depending on the arbitrary value on the stack, the loop may terminate
|
||||
too early, and cause a bogus -ENODEV failure.
|
||||
|
||||
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 16 +++++++---------
|
||||
1 file changed, 7 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
|
||||
index e6d24c2..c22f326 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
|
||||
@@ -124,20 +124,18 @@ static int xgene_enet_ecc_init(struct xgene_enet_pdata *p)
|
||||
{
|
||||
struct net_device *ndev = p->ndev;
|
||||
u32 data;
|
||||
- int i;
|
||||
+ int i = 0;
|
||||
|
||||
xgene_enet_wr_diag_csr(p, ENET_CFG_MEM_RAM_SHUTDOWN_ADDR, 0);
|
||||
- for (i = 0; i < 10 && data != ~0U ; i++) {
|
||||
+ do {
|
||||
usleep_range(100, 110);
|
||||
data = xgene_enet_rd_diag_csr(p, ENET_BLOCK_MEM_RDY_ADDR);
|
||||
- }
|
||||
+ if (data == ~0U)
|
||||
+ return 0;
|
||||
+ } while (++i < 10);
|
||||
|
||||
- if (data != ~0U) {
|
||||
- netdev_err(ndev, "Failed to release memory from shutdown\n");
|
||||
- return -ENODEV;
|
||||
- }
|
||||
-
|
||||
- return 0;
|
||||
+ netdev_err(ndev, "Failed to release memory from shutdown\n");
|
||||
+ return -ENODEV;
|
||||
}
|
||||
|
||||
static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *p)
|
||||
--
|
||||
2.1.0
|
||||
|
||||
78
debian/patches/features/arm64/drivers-net-xgene-fix-Use-separate-resources.patch
vendored
Normal file
78
debian/patches/features/arm64/drivers-net-xgene-fix-Use-separate-resources.patch
vendored
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
From 33b54088743086cd6fdce269486e0bf27ed24155 Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Mon, 3 Nov 2014 11:59:56 -0800
|
||||
Subject: [PATCH 09/11] drivers: net: xgene: fix: Use separate resources
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/commit/?id=bdd330f0506b2c4d02d5453fa32e785f0c348388
|
||||
|
||||
This patch fixes the following kernel crash during SGMII based 1GbE probe.
|
||||
|
||||
BUG: Bad page state in process swapper/0 pfn:40fe6ad
|
||||
page:ffffffbee37a75d8 count:-1 mapcount:0 mapping: (null) index:0x0
|
||||
flags: 0x0()
|
||||
page dumped because: nonzero _count
|
||||
Modules linked in:
|
||||
CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.17.0+ #7
|
||||
Call trace:
|
||||
[<ffffffc000087fa0>] dump_backtrace+0x0/0x12c
|
||||
[<ffffffc0000880dc>] show_stack+0x10/0x1c
|
||||
[<ffffffc0004d981c>] dump_stack+0x74/0xc4
|
||||
[<ffffffc00012fe70>] bad_page+0xd8/0x128
|
||||
[<ffffffc000133000>] get_page_from_freelist+0x4b8/0x640
|
||||
[<ffffffc000133260>] __alloc_pages_nodemask+0xd8/0x834
|
||||
[<ffffffc0004194f8>] __netdev_alloc_frag+0x124/0x1b8
|
||||
[<ffffffc00041bfdc>] __netdev_alloc_skb+0x90/0x10c
|
||||
[<ffffffc00039ff30>] xgene_enet_refill_bufpool+0x11c/0x280
|
||||
[<ffffffc0003a11a4>] xgene_enet_process_ring+0x168/0x340
|
||||
[<ffffffc0003a1498>] xgene_enet_napi+0x1c/0x50
|
||||
[<ffffffc00042b454>] net_rx_action+0xc8/0x18c
|
||||
[<ffffffc0000b0880>] __do_softirq+0x114/0x24c
|
||||
[<ffffffc0000b0c34>] irq_exit+0x94/0xc8
|
||||
[<ffffffc0000e68a0>] __handle_domain_irq+0x8c/0xf4
|
||||
[<ffffffc000081288>] gic_handle_irq+0x30/0x7c
|
||||
|
||||
This was due to hardware resource sharing conflict with the firmware. This
|
||||
patch fixes this crash by using resources (descriptor ring, prefetch buffer)
|
||||
that are not shared.
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 6 +++---
|
||||
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 3 +++
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
index cc3f955..1236696 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
|
||||
@@ -639,9 +639,9 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev)
|
||||
struct device *dev = ndev_to_dev(ndev);
|
||||
struct xgene_enet_desc_ring *rx_ring, *tx_ring, *cp_ring;
|
||||
struct xgene_enet_desc_ring *buf_pool = NULL;
|
||||
- u8 cpu_bufnum = 0, eth_bufnum = 0;
|
||||
- u8 bp_bufnum = 0x20;
|
||||
- u16 ring_id, ring_num = 0;
|
||||
+ u8 cpu_bufnum = 0, eth_bufnum = START_ETH_BUFNUM;
|
||||
+ u8 bp_bufnum = START_BP_BUFNUM;
|
||||
+ u16 ring_id, ring_num = START_RING_NUM;
|
||||
int ret;
|
||||
|
||||
/* allocate rx descriptor ring */
|
||||
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
index dba647d..f9958fa 100644
|
||||
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
|
||||
@@ -38,6 +38,9 @@
|
||||
#define SKB_BUFFER_SIZE (XGENE_ENET_MAX_MTU - NET_IP_ALIGN)
|
||||
#define NUM_PKT_BUF 64
|
||||
#define NUM_BUFPOOL 32
|
||||
+#define START_ETH_BUFNUM 2
|
||||
+#define START_BP_BUFNUM 0x22
|
||||
+#define START_RING_NUM 8
|
||||
|
||||
#define PHY_POLL_LINK_ON (10 * HZ)
|
||||
#define PHY_POLL_LINK_OFF (PHY_POLL_LINK_ON / 5)
|
||||
--
|
||||
2.1.0
|
||||
|
||||
84
debian/patches/features/arm64/dtb-Add-10GbE-node-to-APM-X-Gene-SoC-device-tree.patch
vendored
Normal file
84
debian/patches/features/arm64/dtb-Add-10GbE-node-to-APM-X-Gene-SoC-device-tree.patch
vendored
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
From fe64571ba6b03ee505c4b384da1b335729b36db3 Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Thu, 9 Oct 2014 18:32:04 -0700
|
||||
Subject: [PATCH 10/11] dtb: Add 10GbE node to APM X-Gene SoC device tree
|
||||
Origin: https://git.kernel.org/linus/5fb32417b7e52d2e6d5f5c64d277a03e5c998a02
|
||||
|
||||
Added 10GbE interface and clock nodes.
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
arch/arm64/boot/dts/apm-mustang.dts | 4 ++++
|
||||
arch/arm64/boot/dts/apm-storm.dtsi | 29 ++++++++++++++++++++++++++++-
|
||||
2 files changed, 32 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts
|
||||
index b2f5622..2ae782b 100644
|
||||
--- a/arch/arm64/boot/dts/apm-mustang.dts
|
||||
+++ b/arch/arm64/boot/dts/apm-mustang.dts
|
||||
@@ -32,3 +32,7 @@
|
||||
&menet {
|
||||
status = "ok";
|
||||
};
|
||||
+
|
||||
+&xgenet {
|
||||
+ status = "ok";
|
||||
+};
|
||||
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
index c0aceef..4d762a3 100644
|
||||
--- a/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
@@ -176,6 +176,16 @@
|
||||
clock-output-names = "menetclk";
|
||||
};
|
||||
|
||||
+ xge0clk: xge0clk@1f61c000 {
|
||||
+ compatible = "apm,xgene-device-clock";
|
||||
+ #clock-cells = <1>;
|
||||
+ clocks = <&socplldiv2 0>;
|
||||
+ reg = <0x0 0x1f61c000 0x0 0x1000>;
|
||||
+ reg-names = "csr-reg";
|
||||
+ csr-mask = <0x3>;
|
||||
+ clock-output-names = "xge0clk";
|
||||
+ };
|
||||
+
|
||||
sataphy1clk: sataphy1clk@1f21c000 {
|
||||
compatible = "apm,xgene-device-clock";
|
||||
#clock-cells = <1>;
|
||||
@@ -407,7 +417,8 @@
|
||||
interrupts = <0x0 0x3c 0x4>;
|
||||
dma-coherent;
|
||||
clocks = <&menetclk 0>;
|
||||
- local-mac-address = [00 01 73 00 00 01];
|
||||
+ /* mac address will be overwritten by the bootloader */
|
||||
+ local-mac-address = [00 00 00 00 00 00];
|
||||
phy-connection-type = "rgmii";
|
||||
phy-handle = <&menetphy>;
|
||||
mdio {
|
||||
@@ -421,5 +432,21 @@
|
||||
|
||||
};
|
||||
};
|
||||
+
|
||||
+ xgenet: ethernet@1f610000 {
|
||||
+ compatible = "apm,xgene-enet";
|
||||
+ status = "disabled";
|
||||
+ reg = <0x0 0x1f610000 0x0 0xd100>,
|
||||
+ <0x0 0x1f600000 0x0 0X400>,
|
||||
+ <0x0 0x18000000 0x0 0X200>;
|
||||
+ reg-names = "enet_csr", "ring_csr", "ring_cmd";
|
||||
+ interrupts = <0x0 0x60 0x4>;
|
||||
+ dma-coherent;
|
||||
+ clocks = <&xge0clk 0>;
|
||||
+ /* mac address will be overwritten by the bootloader */
|
||||
+ local-mac-address = [00 00 00 00 00 00];
|
||||
+ phy-connection-type = "xgmii";
|
||||
+ };
|
||||
+
|
||||
};
|
||||
};
|
||||
--
|
||||
2.1.0
|
||||
|
||||
75
debian/patches/features/arm64/dtb-Add-SGMII-based-1GbE-node-to-APM-X-Gene-SoC-devi.patch
vendored
Normal file
75
debian/patches/features/arm64/dtb-Add-SGMII-based-1GbE-node-to-APM-X-Gene-SoC-devi.patch
vendored
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
From 8e17e86dde4b417cdbe8ee9073b8ffc10a1f5afb Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Mon, 13 Oct 2014 17:05:32 -0700
|
||||
Subject: [PATCH 11/11] dtb: Add SGMII based 1GbE node to APM X-Gene SoC device
|
||||
tree
|
||||
Origin: https://git.kernel.org/linus/4c2e7f0954dcd9fbb47d065c654d44608dad38e0
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
arch/arm64/boot/dts/apm-mustang.dts | 4 ++++
|
||||
arch/arm64/boot/dts/apm-storm.dtsi | 24 ++++++++++++++++++++++++
|
||||
2 files changed, 28 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts
|
||||
index 2ae782b..71a1489 100644
|
||||
--- a/arch/arm64/boot/dts/apm-mustang.dts
|
||||
+++ b/arch/arm64/boot/dts/apm-mustang.dts
|
||||
@@ -33,6 +33,10 @@
|
||||
status = "ok";
|
||||
};
|
||||
|
||||
+&sgenet0 {
|
||||
+ status = "ok";
|
||||
+};
|
||||
+
|
||||
&xgenet {
|
||||
status = "ok";
|
||||
};
|
||||
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
index d16cc03..f45bbfe 100644
|
||||
--- a/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
@@ -176,6 +176,16 @@
|
||||
clock-output-names = "menetclk";
|
||||
};
|
||||
|
||||
+ sge0clk: sge0clk@1f21c000 {
|
||||
+ compatible = "apm,xgene-device-clock";
|
||||
+ #clock-cells = <1>;
|
||||
+ clocks = <&socplldiv2 0>;
|
||||
+ reg = <0x0 0x1f21c000 0x0 0x1000>;
|
||||
+ reg-names = "csr-reg";
|
||||
+ csr-mask = <0x3>;
|
||||
+ clock-output-names = "sge0clk";
|
||||
+ };
|
||||
+
|
||||
xge0clk: xge0clk@1f61c000 {
|
||||
compatible = "apm,xgene-device-clock";
|
||||
#clock-cells = <1>;
|
||||
@@ -446,6 +456,20 @@
|
||||
};
|
||||
};
|
||||
|
||||
+ sgenet0: ethernet@1f210000 {
|
||||
+ compatible = "apm,xgene-enet";
|
||||
+ status = "disabled";
|
||||
+ reg = <0x0 0x1f210000 0x0 0x10000>,
|
||||
+ <0x0 0x1f200000 0x0 0X10000>,
|
||||
+ <0x0 0x1B000000 0x0 0X20000>;
|
||||
+ reg-names = "enet_csr", "ring_csr", "ring_cmd";
|
||||
+ interrupts = <0x0 0xA0 0x4>;
|
||||
+ dma-coherent;
|
||||
+ clocks = <&sge0clk 0>;
|
||||
+ local-mac-address = [00 00 00 00 00 00];
|
||||
+ phy-connection-type = "sgmii";
|
||||
+ };
|
||||
+
|
||||
xgenet: ethernet@1f610000 {
|
||||
compatible = "apm,xgene-enet";
|
||||
status = "disabled";
|
||||
--
|
||||
2.1.0
|
||||
|
||||
86
debian/patches/features/arm64/dtb-xgene-fix-Backward-compatibility-with-older-firm.patch
vendored
Normal file
86
debian/patches/features/arm64/dtb-xgene-fix-Backward-compatibility-with-older-firm.patch
vendored
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
From 09c9e0593d7215c809a4a47659b0e760112d656e Mon Sep 17 00:00:00 2001
|
||||
From: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Date: Mon, 3 Nov 2014 11:59:54 -0800
|
||||
Subject: [PATCH] dtb: xgene: fix: Backward compatibility with older firmware
|
||||
Origin: https://git.kernel.org/linus/09c9e0593d7215c809a4a47659b0e760112d656e
|
||||
|
||||
The following kernel crash was reported when using older firmware (<= 1.13.28).
|
||||
|
||||
[ 0.980000] libphy: APM X-Gene MDIO bus: probed
|
||||
[ 1.130000] Unhandled fault: synchronous external abort (0x96000010) at 0xffffff800009a17c
|
||||
[ 1.140000] Internal error: : 96000010 [#1] SMP
|
||||
[ 1.140000] Modules linked in:
|
||||
[ 1.140000] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.17.0+ #21
|
||||
[ 1.140000] task: ffffffc3f0110000 ti: ffffffc3f0064000 task.ti: ffffffc3f0064000
|
||||
[ 1.140000] PC is at ioread32+0x58/0x68
|
||||
[ 1.140000] LR is at xgene_enet_setup_ring+0x18c/0x1cc
|
||||
[ 1.140000] pc : [<ffffffc0003cec68>] lr : [<ffffffc00053dad8>] pstate: a0000045
|
||||
[ 1.140000] sp : ffffffc3f0067b20
|
||||
[ 1.140000] x29: ffffffc3f0067b20 x28: ffffffc000aa8ea0
|
||||
[ 1.140000] x27: ffffffc000bb2000 x26: ffffffc000a64270
|
||||
[ 1.140000] x25: ffffffc000b05ad8 x24: ffffffc0ff99ba58
|
||||
[ 1.140000] x23: 0000000000004000 x22: 0000000000004000
|
||||
[ 1.140000] x21: 0000000000000200 x20: 0000000000200000
|
||||
[ 1.140000] x19: ffffffc0ff99ba18 x18: ffffffc0007a6000
|
||||
[ 1.140000] x17: 0000000000000007 x16: 000000000000000e
|
||||
[ 1.140000] x15: 0000000000000001 x14: 0000000000000000
|
||||
[ 1.140000] x13: ffffffbeedb71320 x12: 00000000ffffff80
|
||||
[ 1.140000] x11: 0000000000000002 x10: 0000000000000000
|
||||
[ 1.140000] x9 : 0000000000000000 x8 : ffffffc3eb2a4000
|
||||
[ 1.140000] x7 : 0000000000000000 x6 : 0000000000000000
|
||||
[ 1.140000] x5 : 0000000001080000 x4 : 000000007d654010
|
||||
[ 1.140000] x3 : ffffffffffffffff x2 : 000000000003ffff
|
||||
[ 1.140000] x1 : ffffff800009a17c x0 : ffffff800009a17c
|
||||
|
||||
The issue was that the older firmware does not support 10GbE and
|
||||
SGMII based 1GBE interfaces.
|
||||
|
||||
This patch changes the address length of the reg property of sgmii0 and xgmii
|
||||
nodes and serves as preparatory patch for the fix.
|
||||
|
||||
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
|
||||
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
|
||||
Reported-by: Dann Frazier <dann.frazier@canonical.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
arch/arm64/boot/dts/apm-storm.dtsi | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
index 295c72d..f1ad9c2 100644
|
||||
--- a/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
@@ -599,7 +599,7 @@
|
||||
compatible = "apm,xgene-enet";
|
||||
status = "disabled";
|
||||
reg = <0x0 0x17020000 0x0 0xd100>,
|
||||
- <0x0 0X17030000 0x0 0X400>,
|
||||
+ <0x0 0X17030000 0x0 0Xc300>,
|
||||
<0x0 0X10000000 0x0 0X200>;
|
||||
reg-names = "enet_csr", "ring_csr", "ring_cmd";
|
||||
interrupts = <0x0 0x3c 0x4>;
|
||||
@@ -624,9 +624,9 @@
|
||||
sgenet0: ethernet@1f210000 {
|
||||
compatible = "apm,xgene-enet";
|
||||
status = "disabled";
|
||||
- reg = <0x0 0x1f210000 0x0 0x10000>,
|
||||
- <0x0 0x1f200000 0x0 0X10000>,
|
||||
- <0x0 0x1B000000 0x0 0X20000>;
|
||||
+ reg = <0x0 0x1f210000 0x0 0xd100>,
|
||||
+ <0x0 0x1f200000 0x0 0Xc300>,
|
||||
+ <0x0 0x1B000000 0x0 0X200>;
|
||||
reg-names = "enet_csr", "ring_csr", "ring_cmd";
|
||||
interrupts = <0x0 0xA0 0x4>;
|
||||
dma-coherent;
|
||||
@@ -639,7 +639,7 @@
|
||||
compatible = "apm,xgene-enet";
|
||||
status = "disabled";
|
||||
reg = <0x0 0x1f610000 0x0 0xd100>,
|
||||
- <0x0 0x1f600000 0x0 0X400>,
|
||||
+ <0x0 0x1f600000 0x0 0Xc300>,
|
||||
<0x0 0x18000000 0x0 0X200>;
|
||||
reg-names = "enet_csr", "ring_csr", "ring_cmd";
|
||||
interrupts = <0x0 0x60 0x4>;
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -51,6 +51,12 @@ bugfix/arm/omap-musb-choice.patch
|
|||
bugfix/mips/disable-advansys.patch
|
||||
bugfix/m68k/ethernat-kconfig.patch
|
||||
bugfix/parisc/parisc-reduce-sigrtmin-from-37-to-32-to-behave-like-.patch
|
||||
bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch
|
||||
bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
|
||||
bugfix/x86/x86_64-traps-Stop-using-IST-for-SS.patch
|
||||
bugfix/x86/x86_64-traps-Fix-the-espfix64-DF-fixup-and-rewrite-i.patch
|
||||
bugfix/x86/x86_64-traps-Rework-bad_iret.patch
|
||||
bugfix/x86/x86-asm-traps-Disable-tracing-and-kprobes-in-fixup_b.patch
|
||||
|
||||
# Arch features
|
||||
features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
|
||||
|
|
@ -63,7 +69,20 @@ features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch
|
|||
features/arm/dts-sun7i-Add-spi0_pins_a-pinctrl-setting.patch
|
||||
features/arm/dts-sun7i-Add-uart3_pins_b-pinctrl-setting.patch
|
||||
features/arm/dts-sun7i-Add-Banana-Pi-board.patch
|
||||
features/arm/dts-sunxi-Banana-Pi-increase-startup-delay-for-the-GMAC-PHY-regulator.patch
|
||||
features/arm/dts-sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME.patch
|
||||
features/arm64/drivers-net-xgene-Preparing-for-adding-10GbE-support.patch
|
||||
features/arm64/drivers-net-xgene-Add-10GbE-support.patch
|
||||
features/arm64/drivers-net-xgene-Add-10GbE-ethtool-support.patch
|
||||
features/arm64/drivers-net-xgene-Preparing-for-adding-SGMII-based-1.patch
|
||||
features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-support.patch
|
||||
features/arm64/drivers-net-xgene-Add-SGMII-based-1GbE-ethtool-suppo.patch
|
||||
features/arm64/drivers-net-xgene-Rewrite-buggy-loop-in-xgene_enet_e.patch
|
||||
features/arm64/drivers-net-xgene-Backward-compatibility-with-older-.patch
|
||||
features/arm64/drivers-net-xgene-fix-Use-separate-resources.patch
|
||||
features/arm64/dtb-Add-10GbE-node-to-APM-X-Gene-SoC-device-tree.patch
|
||||
features/arm64/dtb-Add-SGMII-based-1GbE-node-to-APM-X-Gene-SoC-devi.patch
|
||||
features/arm64/dtb-xgene-fix-Backward-compatibility-with-older-firm.patch
|
||||
|
||||
# Miscellaneous bug fixes
|
||||
bugfix/all/misc-bmp085-Enable-building-as-a-module.patch
|
||||
|
|
@ -72,11 +91,15 @@ bugfix/all/disable-some-marvell-phys.patch
|
|||
debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
|
||||
bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch
|
||||
bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
|
||||
bugfix/all/mtd-move-support-for-struct-flash_platform_data-into.patch
|
||||
bugfix/all/mtd-m25p80-get-rid-of-spi_get_device_id.patch
|
||||
bugfix/all/mtd-spi-nor-make-spi_nor_scan-take-a-chip-type-name-.patch
|
||||
bugfix/all/net-mv643xx-disable-tso-by-default.patch
|
||||
bugfix/all/drivers-net-Disable-UFO-through-virtio.patch
|
||||
bugfix/all/revert-drivers-net-disable-ufo-through-virtio-in-macvtap-and-tun.patch
|
||||
bugfix/all/xen-netback-make-feature-rx-notify-mandatory.patch
|
||||
bugfix/all/xen-netback-fix-unlimited-guest-Rx-internal-queue-an.patch
|
||||
bugfix/all/xen-netback-reintroduce-guest-Rx-stall-detection.patch
|
||||
bugfix/all/of-fdt-memblock_reserve-memreserve-regions-in-the-ca.patch
|
||||
|
||||
# Miscellaneous features
|
||||
features/all/efi-autoload-efivars.patch
|
||||
features/all/mmc_block-increase-max_devices.patch
|
||||
features/all/of-add-optional-options-parameter-to-of_find_node_by.patch
|
||||
features/all/of-support-passing-console-options-with-stdout-path.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue