Skip to content

Commit 6fe87b7

Browse files
amartinzamartinz
committed
Merge branch 'android-4.9-q' of https://android.googlesource.com/kernel/common into lineage-20
----- Merge list: f9b8314 UPSTREAM: ipv6: raw: Deduct extension header length in rawv6_push_pending_frames 1b1e3a2 UPSTREAM: netfilter: ipset: Fix overflow before widen in the bitmap_ip_create() function. 7e6dfb2 Merge 4.9.337 into android-4.9-q 87a72e8 Linux 4.9.337 56836c3 ext4: initialize quota before expanding inode in setproject ioctl 9c4ef44 ext4: avoid BUG_ON when creating xattrs 0735746 ext4: fix error code return to user-space in ext4_get_branch() 67f6d5a ext4: init quota for 'old.inode' in 'ext4_rename' e76ede9 ext4: fix bug_on in __es_tree_search caused by bad boot loader inode dd5639d ext4: fix undefined behavior in bit shift for ext4_check_flag_values 08cd26a ext4: add inode table check in __ext4_get_inode_loc to aovid possible infinite loop ee8d318 drm/vmwgfx: Validate the box size for the snooped cursor 080569a drm/connector: send hotplug uevent on connector cleanup 73adc28 device_cgroup: Roll back to original exceptions after copy failure c6db0c3 parisc: led: Fix potential null-ptr-deref in start_task() fbac2c5 iommu/amd: Fix ivrs_acpihid cmdline parsing code be61cad crypto: n2 - add missing hash statesize 5e41198 PCI/sysfs: Fix double free in error path 0f4dfff cifs: fix confusing debug message 0588b12 media: dvb-core: Fix double free in dvb_register_device() 7854d3b ARM: 9256/1: NWFPE: avoid compiler-generated __aeabi_uldivmod 61d589b tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line 67a4e29 dm cache: set needs_check flag after aborting metadata 034cbc8 dm cache: Fix UAF in destroy() 7ee059d dm thin: Fix UAF in run_timer_softirq() b35a227 dm thin: Use last transaction's pmd->root when commit failed 6e237ca dm cache: Fix ABBA deadlock between shrink_slab and dm_cache_metadata_abort 4be6501 ARM: ux500: do not directly dereference __iomem 2d308bd ktest.pl minconfig: Unset configs instead of just removing them fca7a1c media: stv0288: use explicitly signed char 32d5af2 mmc: vub300: fix warning - do not call blocking ops when !TASK_RUNNING 732cd66 md: fix a crash in mempool_free cad0d17 pnode: terminate at peers of source b026af9 ALSA: line6: fix stack overflow in line6_midi_transmit 0407e79 ALSA: line6: correct midi status byte when receiving data from podxt ff939af hfsplus: fix bug causing custom uid and gid being unable to be assigned with mount e28690c HID: plantronics: Additional PIDs for double volume key presses quirk f413135 powerpc/rtas: avoid scheduling in rtas_os_term() 48e2ba6 gcov: add support for checksum field c8b577f iio: adc: ad_sigma_delta: do not use internal iio_dev lock 0cf939d reiserfs: Add missing calls to reiserfs_security_free() f21b8dd HID: wacom: Ensure bootloader PID is usable in hidraw mode 525f1c8 ASoC: rt5670: Remove unbalanced pm_runtime_put() 593f0c9 ASoC: rockchip: spdif: Add missing clk_disable_unprepare() in rk_spdif_runtime_resume() b606ae0 ASoC: wm8994: Fix potential deadlock 5f6d578 ASoC: mediatek: mt8173-rt5650-rt5514: fix refcount leak in mt8173_rt5650_rt5514_dev_probe() 44d3eac orangefs: Fix kmemleak in orangefs_prepare_debugfs_help_string() b2c92b2 drm/sti: Fix return type of sti_{dvo,hda,hdmi}_connector_mode_valid() 1cca6ac drm/fsl-dcu: Fix return type of fsl_dcu_drm_connector_mode_valid() 081538a clk: st: Fix memory leak in st_of_quadfs_setup() 146bd00 media: si470x: Fix use-after-free in si470x_int_in_callback() 623cdf2 mmc: f-sdh30: Add quirks for broken timeout clock capability 6548707 blk-mq: fix possible memleak when register 'hctx' failed 733bc9e media: dvb-usb: fix memory leak in dvb_usb_adapter_init() afccb6a media: dvb-frontends: fix leak of memory fw e387a25 ppp: associate skb with a device at tx 98f53e5 mrp: introduce active flags to prevent UAF when applicant uninit d684ceb md/raid1: stop mdx_raid1 thread when raid1 array run failed a7c2d8c drm/sti: Use drm_mode_copy() 7b4da3f s390/lcs: Fix return type of lcs_start_xmit() f13d870 s390/netiucv: Fix return type of netiucv_tx() 636a701 s390/ctcm: Fix return type of ctc{mp,}m_tx() 64ca196 igb: Do not free q_vector unless new one was allocated 1db036d wifi: brcmfmac: Fix potential shift-out-of-bounds in brcmf_fw_alloc_request() d467bbc hamradio: baycom_epp: Fix return type of baycom_send_packet() a447479 net: ethernet: ti: Fix return type of netcp_ndo_start_xmit() 3fa7cbd ipmi: fix memleak when unload ipmi driver c9ba3fb wifi: ar5523: Fix use-after-free on ar5523_cmd() timed out 932f0a5 wifi: ath9k: verify the expected usb_endpoints are present 8c40f2d hfs: fix OOB Read in __hfs_brec_find e93f995 acct: fix potential integer overflow in encode_comp_t() 6b0ea3d nilfs2: fix shift-out-of-bounds/overflow in nilfs_sb2_bad_offset() 38e251d ACPICA: Fix error code path in acpi_ds_call_control_method() f8d4d0b fs: jfs: fix shift-out-of-bounds in dbDiscardAG 78eba27 udf: Avoid double brelse() in udf_rename() d3b4869 fs: jfs: fix shift-out-of-bounds in dbAllocAG 0f1a489 binfmt_misc: fix shift-out-of-bounds in check_special_flags c8c1eec net: stream: purge sk_error_queue in sk_stream_kill_queues() a4da73a myri10ge: Fix an error handling path in myri10ge_probe() 4d5d13e net_sched: reject TCF_EM_SIMPLE case for complex ematch module ff3743d skbuff: Account for tail adjustment during pull operations 4f592e7 openvswitch: Fix flow lookup to use unmasked key a04707f r6040: Fix kmemleak in probe and remove 9da4a04 nfc: pn533: Clear nfc_target before being used 7f1cda9 mISDN: hfcmulti: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() fc24113 mISDN: hfcpci: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() 291b787 mISDN: hfcsusb: don't call dev_kfree_skb/kfree_skb() under spin_lock_irqsave() 707bcca nfsd: under NFSv4.1, fix double svc_xprt_put on rpc_create failure 4761ab9 rtc: st-lpc: Add missing clk_disable_unprepare in st_rtc_probe() 81a61f3 selftests/powerpc: Fix resource leaks 1bd3768 powerpc/hv-gpci: Fix hv_gpci event list 225c852 powerpc/83xx/mpc832x_rdb: call platform_device_put() in error case in of_fsl_spi_probe() 4a62ab0 powerpc/perf: callchain validate kernel stack pointer bounds be9caf2 powerpc/52xx: Fix a resource leak in an error handling path aaf59a4 macintosh/macio-adb: check the return value of ioremap() 3a866ff macintosh: fix possible memory leak in macio_add_one_device() c939832 iommu/fsl_pamu: Fix resource leak in fsl_pamu_probe() 4be1a8d rtc: snvs: Allow a time difference on clock register read 4e0b636 include/uapi/linux/swab: Fix potentially missing __always_inline 7f43b9a HSI: omap_ssi_core: Fix error handling in ssi_init() 29a5727 power: supply: fix residue sysfs file in error handle route of __power_supply_register() 107eb67 HSI: omap_ssi_core: fix possible memory leak in ssi_probe() 8a502df HSI: omap_ssi_core: fix unbalanced pm_runtime_disable() 8a62bc1 fbdev: uvesafb: Fixes an error handling path in uvesafb_probe() 4383832 fbdev: vermilion: decrease reference count in error path 5bf10c3 fbdev: via: Fix error in via_core_init() 0a71d04 fbdev: pm2fb: fix missing pci_disable_device() c0cdb87 fbdev: ssd1307fb: Drop optional dependency 0b8a070 usb: storage: Add check for kcalloc 4a7bb1d i2c: ismt: Fix an out-of-bounds bug in ismt_access() e831fdd vme: Fix error not catched in fake_init() cf7d89e staging: rtl8192e: Fix potential use-after-free in rtllib_rx_Monitor() 9c03db0 staging: rtl8192u: Fix use after free in ieee80211_rx() 9e6fe3e i2c: pxa-pci: fix missing pci_disable_device() on error in ce4100_i2c_probe 5d21468 chardev: fix error handling in cdev_device_add() 891f606 mcb: mcb-parse: fix error handing in chameleon_parse_gdd() 531ac7b drivers: mcb: fix resource leak in mcb_probe() 82e6843 cxl: fix possible null-ptr-deref in cxl_pci_init_afu|adapter() 96fba6f cxl: fix possible null-ptr-deref in cxl_guest_init_afu|adapter() f99d5f1 misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os 2bbb222 misc: tifm: fix possible memory leak in tifm_7xx1_switch_media() 5ea80d3 serial: sunsab: Fix error handling in sunsab_init() 90ff030 serial: pch: Fix PCI device refcount leak in pch_request_dma() 1c5f0d3 serial: amba-pl011: avoid SBSA UART accessing DMACR register 5cc4eea staging: vme_user: Fix possible UAF in tsi148_dma_list_add 92a0e90 usb: fotg210-udc: Fix ages old endianness issues 35a27f3 uio: uio_dmem_genirq: Fix deadlock between irq config and handling 9977cb7 uio: uio_dmem_genirq: Fix missing unlock in irq configuration a896a01 vfio: platform: Do not pass return buffer to ACPI _RST method affe3ce drivers: dio: fix possible memory leak in dio_init() 2aecfec IB/IPoIB: Fix queue count inconsistency for PKEY child interfaces 88f4ea6 hwrng: geode - Fix PCI device refcount leak f1c97f7 hwrng: amd - Fix PCI device refcount leak 84e4794 crypto: img-hash - Fix variable dereferenced before check 'hdev->req' 36ffa81 orangefs: Fix sysfs not cleanup when dev init failed f9d8b8b scsi: snic: Fix possible UAF in snic_tgt_create() d581303 scsi: fcoe: Fix transport not deattached when fcoe_if_init() fails 020b660 scsi: ipr: Fix WARNING in ipr_init() 16b2077 scsi: fcoe: Fix possible name leak when device_register() fails 07e97ce scsi: hpsa: Fix possible memory leak in hpsa_add_sas_device() e744faa scsi: hpsa: Fix error handling in hpsa_add_sas_host() 27353e2 stmmac: fix potential division by 0 54c7317 Bluetooth: hci_core: don't call kfree_skb() under spin_lock_irqsave() 0913307 Bluetooth: hci_bcsp: don't call kfree_skb() under spin_lock_irqsave() 5c366b9 Bluetooth: hci_h5: don't call kfree_skb() under spin_lock_irqsave() f9c7eb2 Bluetooth: hci_qca: don't call kfree_skb() under spin_lock_irqsave() c7276ee Bluetooth: btusb: don't call kfree_skb() under spin_lock_irqsave() d4460c8 ntb_netdev: Use dev_kfree_skb_any() in interrupt context d90f63e net: amd: lance: don't call dev_kfree_skb() under spin_lock_irqsave() 84af17d hamradio: don't call dev_kfree_skb() under spin_lock_irqsave() 82b04c2 net: ethernet: dnet: don't call dev_kfree_skb() under spin_lock_irqsave() cce993d net: emaclite: don't call dev_kfree_skb() under spin_lock_irqsave() 6537d36 net: apple: bmac: don't call dev_kfree_skb() under spin_lock_irqsave() 4605775 net: apple: mace: don't call dev_kfree_skb() under spin_lock_irqsave() e831658 net/tunnel: wait until all sk_user_data reader finish before releasing the sock 41798a0 net: farsync: Fix kmemleak when rmmods farsync 0d30b9f ethernet: s2io: don't call dev_kfree_skb() under spin_lock_irqsave() 15770ed drivers: net: qlcnic: Fix potential memory leak in qlcnic_sriov_init() cdf10b5 net: defxx: Fix missing err handling in dfx_init() 1afe89a net: vmw_vsock: vmci: Check memcpy_from_msg() fe70cea blktrace: Fix output non-blktrace event when blk_classic option enabled 56758e9 wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware() 5a55f03 wifi: rtl8xxxu: Add __packed to struct rtl8723bu_c2h d308c4a media: coda: Add check for kmalloc 5688d33 media: coda: Add check for dcoda_iram_alloc 52a736c media: c8sectpfe: Add of_node_put() when breaking out of loop b839998 mmc: mmci: fix return value check of mmc_add_host() fc85606 mmc: wbsd: fix return value check of mmc_add_host() 076bcd2 mmc: via-sdmmc: fix return value check of mmc_add_host() 41ed46b mmc: vub300: fix return value check of mmc_add_host() 34ae492 mmc: toshsd: fix return value check of mmc_add_host() d7ad727 mmc: rtsx_usb_sdmmc: fix return value check of mmc_add_host() 5f35c03 mmc: mxcmmc: fix return value check of mmc_add_host() a4c765f mmc: moxart: fix return value check of mmc_add_host() b149509 SUNRPC: Fix missing release socket in rpc_sockname() 06ec592 ALSA: mts64: fix possible null-ptr-defer in snd_mts64_interrupt 6204de8 media: saa7164: fix missing pci_disable_device() 68c4ab9 regulator: core: fix module refcount leak in set_supply() 3b5357f bonding: uninitialized variable in bond_miimon_inspect() 485029c ASoC: pcm512x: Fix PM disable depth imbalance in pcm512x_probe 6611fee drm/amdgpu: Fix PCI device refcount leak in amdgpu_atrm_get_bios() 6f28c7f drm/radeon: Fix PCI device refcount leak in radeon_atrm_get_bios() c0e07da ALSA: asihpi: fix missing pci_disable_device() 5cc6b7a NFSv4: Fix a deadlock between nfs4_open_recover_helper() and delegreturn 6f38446 NFSv4.2: Fix a memory stomp in decode_attr_security_label 2b6a8a1 media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer() 7fb8cc3 pinctrl: pinconf-generic: add missing of_node_put() 075e24f media: imon: fix a race condition in send_packet() cb3f35f mtd: maps: pxa2xx-flash: fix memory leak in probe 20201c3 clk: rockchip: Fix memory leak in rockchip_clk_register_pll() 30f7975 ALSA: seq: fix undefined behavior in bit shift for SNDRV_SEQ_FILTER_USE_EVENT b2eb9ec HID: hid-sensor-custom: set fixed size for custom attributes 93e7079 media: platform: exynos4-is: Fix error handling in fimc_md_init() 83d4b1a media: solo6x10: fix possible memory leak in solo_sysfs_init() 6590d09 Input: elants_i2c - properly handle the reset GPIO when power is off 4d10bd7 mtd: lpddr2_nvm: Fix possible null-ptr-deref a4505bb wifi: ath10k: Fix return value in ath10k_pci_init() eaba2df ima: Fix misuse of dereference of pointer in template_desc_init_fields() 0e88505 regulator: core: fix unbalanced of node refcount in regulator_dev_lookup() 3ec75e0 ASoC: pxa: fix null-pointer dereference in filter() a75f45a mtd: Fix device name leak when register device failed in add_mtd_device() 8c0ee15 media: vivid: fix compose size exceed boundary dc8da40 media: i2c: ad5820: Fix error path 5e8751a wifi: ath9k: hif_usb: Fix use-after-free in ath9k_hif_usb_reg_in_cb() 134ae5e wifi: ath9k: hif_usb: fix memory leak of urbs in ath9k_hif_usb_dealloc_tx_urbs() 6e4540e rapidio: devices: fix missing put_device in mport_cdev_open 8399318 hfs: Fix OOB Write in hfs_asc2mac c25ad86 eventfd: change int to __u64 in eventfd_signal() ifndef CONFIG_EVENTFD 2a6c75a rapidio: fix possible UAF when kfifo_alloc() fails 9498f67 fs: sysv: Fix sysv_nblocks() returns wrong value 1fa9558 MIPS: BCM63xx: Add check for NULL for clk in clk_enable 9278bdb x86/xen: Fix memory leak in xen_init_lock_cpu() 7df153f uprobes/x86: Allow to probe a NOP instruction with 0x66 prefix 133462d ACPICA: Fix use-after-free in acpi_ut_copy_ipackage_to_ipackage() 0a71344 rapidio: rio: fix possible name leak in rio_register_mport() 3b4676f rapidio: fix possible name leaks when rio_add_device() fails bf0c25c lib/notifier-error-inject: fix error when writing -errno to debugfs file 111e540 libfs: add DEFINE_SIMPLE_ATTRIBUTE_SIGNED for signed value 690a864 irqchip: gic-pm: Use pm_runtime_resume_and_get() in gic_probe() ea77b4b PNP: fix name memory leak in pnp_alloc_dev() c5b088a MIPS: vpe-cmp: fix possible memory leak while module exiting 170e991 MIPS: vpe-mt: fix possible memory leak while module exiting 0000281 ocfs2: fix memory leak in ocfs2_stack_glue_init() b1c63d8 timerqueue: Use rb_entry_safe() in timerqueue_getnext() d3715b0 perf: Fix possible memleak in pmu_dev_alloc() f8c5011 fs: don't audit the capability check in simple_xattr_list() a343469 PM: hibernate: Fix mistake in kerneldoc comment 0e395fe alpha: fix syscall entry in !AUDUT_SYSCALL case eea8631 cpuidle: dt: Return the correct numbers of parsed idle states 1579bed pstore: Avoid kcore oops by vmap()ing with VM_IOREMAP 3fd56ad ARM: mmp: fix timer_read delay 6b130bd ARM: dts: armada-39x: Fix assigned-addresses for every PCIe Root Port 0dcbcfd ARM: dts: armada-38x: Fix assigned-addresses for every PCIe Root Port 24a645a ARM: dts: armada-375: Fix assigned-addresses for every PCIe Root Port 97309af ARM: dts: armada-xp: Fix assigned-addresses for every PCIe Root Port f095946 ARM: dts: armada-370: Fix assigned-addresses for every PCIe Root Port d90167d ARM: dts: dove: Fix assigned-addresses for every PCIe Root Port 23d41ad soc: ti: smartreflex: Fix PM disable depth imbalance in omap_sr_probe 0a01300 arm: dts: spear600: Fix clcd interrupt a1e186b drivers: soc: ti: knav_qmss_queue: Mark knav_acc_firmwares as static 5fc7f71 net: loopback: use NET_NAME_PREDICTABLE for name_assign_type 49d5867 Bluetooth: L2CAP: Fix u8 overflow d4e43b2 USB: serial: cp210x: add Kamstrup RF sniffer PIDs 4972e35 usb: gadget: uvc: Prevent buffer overflow in setup handler 9391da5 udf: Fix extending file within last block 1f9eae3 udf: Do not bother looking for prealloc extents if i_lenExtents matches i_size c8b6fa4 udf: Fix preallocation discarding at indirect extent boundary a58ae14 udf: Drop unused arguments of udf_delete_aext() 4a1c338 udf: Discard preallocation before extending file with a hole 041030f ASoC: ops: Correct bounds check for second channel on SX controls 0d3ee59 can: sja1000: fix size of OCR_MODE_MASK define 5628898 ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() 4726b66 block: unhash blkdev part inode when the part is deleted 275c626 mm/khugepaged: invoke MMU notifiers in shmem/file collapse paths 588be4a mm/khugepaged: fix GUP-fast interaction by sending IPI ----- Change-Id: Ibc615b850bbc96ce90f434376a485506eaa3894c Signed-off-by: Alexander Martinz <[email protected]>
2 parents d54aefd + f9b8314 commit 6fe87b7

File tree

263 files changed

+1302
-561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+1302
-561
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 9
3-
SUBLEVEL = 336
3+
SUBLEVEL = 337
44
EXTRAVERSION =
55
NAME = Roaring Lionus
66

‎arch/alpha/kernel/entry.S

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,10 @@ entSys:
468468
#ifdef CONFIG_AUDITSYSCALL
469469
lda $6, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
470470
and $3, $6, $3
471-
#endif
472471
bne $3, strace
472+
#else
473+
blbs $3, strace /* check for SYSCALL_TRACE in disguise */
474+
#endif
473475
beq $4, 1f
474476
ldq $27, 0($5)
475477
1: jsr $26, ($27), alpha_ni_syscall

‎arch/arm/boot/dts/armada-370.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108

109109
pcie@2,0 {
110110
device_type = "pci";
111-
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
111+
assigned-addresses = <0x82001000 0 0x80000 0 0x2000>;
112112
reg = <0x1000 0 0 0 0>;
113113
#address-cells = <3>;
114114
#size-cells = <2>;

‎arch/arm/boot/dts/armada-375.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@
618618

619619
pcie@2,0 {
620620
device_type = "pci";
621-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
621+
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
622622
reg = <0x1000 0 0 0 0>;
623623
#address-cells = <3>;
624624
#size-cells = <2>;

‎arch/arm/boot/dts/armada-380.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
/* x1 port */
116116
pcie@2,0 {
117117
device_type = "pci";
118-
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
118+
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
119119
reg = <0x1000 0 0 0 0>;
120120
#address-cells = <3>;
121121
#size-cells = <2>;
@@ -133,7 +133,7 @@
133133
/* x1 port */
134134
pcie@3,0 {
135135
device_type = "pci";
136-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
136+
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
137137
reg = <0x1800 0 0 0 0>;
138138
#address-cells = <3>;
139139
#size-cells = <2>;

‎arch/arm/boot/dts/armada-385.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
/* x1 port */
127127
pcie@2,0 {
128128
device_type = "pci";
129-
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
129+
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
130130
reg = <0x1000 0 0 0 0>;
131131
#address-cells = <3>;
132132
#size-cells = <2>;
@@ -144,7 +144,7 @@
144144
/* x1 port */
145145
pcie@3,0 {
146146
device_type = "pci";
147-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
147+
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
148148
reg = <0x1800 0 0 0 0>;
149149
#address-cells = <3>;
150150
#size-cells = <2>;
@@ -165,7 +165,7 @@
165165
*/
166166
pcie@4,0 {
167167
device_type = "pci";
168-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
168+
assigned-addresses = <0x82002000 0 0x48000 0 0x2000>;
169169
reg = <0x2000 0 0 0 0>;
170170
#address-cells = <3>;
171171
#size-cells = <2>;

‎arch/arm/boot/dts/armada-39x.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@
492492
/* x1 port */
493493
pcie@2,0 {
494494
device_type = "pci";
495-
assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
495+
assigned-addresses = <0x82001000 0 0x40000 0 0x2000>;
496496
reg = <0x1000 0 0 0 0>;
497497
#address-cells = <3>;
498498
#size-cells = <2>;
@@ -510,7 +510,7 @@
510510
/* x1 port */
511511
pcie@3,0 {
512512
device_type = "pci";
513-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
513+
assigned-addresses = <0x82001800 0 0x44000 0 0x2000>;
514514
reg = <0x1800 0 0 0 0>;
515515
#address-cells = <3>;
516516
#size-cells = <2>;
@@ -531,7 +531,7 @@
531531
*/
532532
pcie@4,0 {
533533
device_type = "pci";
534-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
534+
assigned-addresses = <0x82002000 0 0x48000 0 0x2000>;
535535
reg = <0x2000 0 0 0 0>;
536536
#address-cells = <3>;
537537
#size-cells = <2>;

‎arch/arm/boot/dts/armada-xp-mv78230.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133

134134
pcie@2,0 {
135135
device_type = "pci";
136-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
136+
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
137137
reg = <0x1000 0 0 0 0>;
138138
#address-cells = <3>;
139139
#size-cells = <2>;
@@ -150,7 +150,7 @@
150150

151151
pcie@3,0 {
152152
device_type = "pci";
153-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
153+
assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
154154
reg = <0x1800 0 0 0 0>;
155155
#address-cells = <3>;
156156
#size-cells = <2>;
@@ -167,7 +167,7 @@
167167

168168
pcie@4,0 {
169169
device_type = "pci";
170-
assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
170+
assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
171171
reg = <0x2000 0 0 0 0>;
172172
#address-cells = <3>;
173173
#size-cells = <2>;
@@ -184,7 +184,7 @@
184184

185185
pcie@5,0 {
186186
device_type = "pci";
187-
assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
187+
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
188188
reg = <0x2800 0 0 0 0>;
189189
#address-cells = <3>;
190190
#size-cells = <2>;

‎arch/arm/boot/dts/armada-xp-mv78260.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148

149149
pcie@2,0 {
150150
device_type = "pci";
151-
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
151+
assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
152152
reg = <0x1000 0 0 0 0>;
153153
#address-cells = <3>;
154154
#size-cells = <2>;
@@ -165,7 +165,7 @@
165165

166166
pcie@3,0 {
167167
device_type = "pci";
168-
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
168+
assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
169169
reg = <0x1800 0 0 0 0>;
170170
#address-cells = <3>;
171171
#size-cells = <2>;
@@ -182,7 +182,7 @@
182182

183183
pcie@4,0 {
184184
device_type = "pci";
185-
assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
185+
assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
186186
reg = <0x2000 0 0 0 0>;
187187
#address-cells = <3>;
188188
#size-cells = <2>;
@@ -199,7 +199,7 @@
199199

200200
pcie@5,0 {
201201
device_type = "pci";
202-
assigned-addresses = <0x82000800 0 0x80000 0 0x2000>;
202+
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
203203
reg = <0x2800 0 0 0 0>;
204204
#address-cells = <3>;
205205
#size-cells = <2>;
@@ -216,7 +216,7 @@
216216

217217
pcie@6,0 {
218218
device_type = "pci";
219-
assigned-addresses = <0x82000800 0 0x84000 0 0x2000>;
219+
assigned-addresses = <0x82003000 0 0x84000 0 0x2000>;
220220
reg = <0x3000 0 0 0 0>;
221221
#address-cells = <3>;
222222
#size-cells = <2>;
@@ -233,7 +233,7 @@
233233

234234
pcie@7,0 {
235235
device_type = "pci";
236-
assigned-addresses = <0x82000800 0 0x88000 0 0x2000>;
236+
assigned-addresses = <0x82003800 0 0x88000 0 0x2000>;
237237
reg = <0x3800 0 0 0 0>;
238238
#address-cells = <3>;
239239
#size-cells = <2>;
@@ -250,7 +250,7 @@
250250

251251
pcie@8,0 {
252252
device_type = "pci";
253-
assigned-addresses = <0x82000800 0 0x8c000 0 0x2000>;
253+
assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>;
254254
reg = <0x4000 0 0 0 0>;
255255
#address-cells = <3>;
256256
#size-cells = <2>;
@@ -267,7 +267,7 @@
267267

268268
pcie@9,0 {
269269
device_type = "pci";
270-
assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
270+
assigned-addresses = <0x82004800 0 0x42000 0 0x2000>;
271271
reg = <0x4800 0 0 0 0>;
272272
#address-cells = <3>;
273273
#size-cells = <2>;

‎arch/arm/boot/dts/dove.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
pcie1: pcie-port@1 {
128128
device_type = "pci";
129129
status = "disabled";
130-
assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
130+
assigned-addresses = <0x82001000 0 0x80000 0 0x2000>;
131131
reg = <0x1000 0 0 0 0>;
132132
clocks = <&gate_clk 5>;
133133
marvell,pcie-port = <1>;

0 commit comments

Comments
 (0)