- Linux-stable-mirror - lists.linaro.org

[PATCH v2 1/2] cpufreq: ti-cpufreq: Fix an incorrect error return value

by Suman Anna

Commit 05829d9431df ("cpufreq: ti-cpufreq: kfree opp_data when failure") has fixed a memory leak in the failure path, however the patch returned a positive value on get_cpu_device() failure instead of the previous negative value. Fix this incorrect error return value properly. Fixes: 05829d9431df ("cpufreq: ti-cpufreq: kfree opp_data when failure") Cc: Zumeng Chen <zumeng.chen(a)gmail.com> Cc: stable(a)vger.kernel.org Signed-off-by: Suman Anna <s-anna(a)ti.com> --- drivers/cpufreq/ti-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c index a099b7bf74cd..46d1ab2dea87 100644 --- a/drivers/cpufreq/ti-cpufreq.c +++ b/drivers/cpufreq/ti-cpufreq.c @@ -226,7 +226,7 @@ static int ti_cpufreq_probe(struct platform_device *pdev) opp_data->cpu_dev = get_cpu_device(0); if (!opp_data->cpu_dev) { pr_err("%s: Failed to get device for CPU0\n", __func__); - ret = ENODEV; + ret = -ENODEV; goto free_opp_data; } -- 2.16.2

7 years, 7 months

3
2
0 0

Re: [PATCH v2] i2c: i801: blacklist Host Notify on HP EliteBook G3 850

by Sasha Levin

Hi Jason Andryuk. [This is an automated email] This commit has been processed by the -stable helper bot and determined to be a high probability candidate for -stable trees. (score: 5.1557) The bot has tested the following trees: v4.15.15, v4.14.32, v4.9.92, v4.4.126, v4.15.15: Build OK! v4.14.32: Build OK! v4.9.92: Build OK! v4.4.126: Build failed! Errors: drivers/i2c/busses/i2c-i801.c:916:22: error: ‘FEATURE_HOST_NOTIFY’ undeclared (first use in this function); did you mean ‘X86_FEATURE_HWP_NOTIFY’? Please let us know if you'd like to have this patch included in a stable tree. -- Thanks. Sasha

7 years, 7 months

2
2
0 0

+ fs-reiserfs-journalc-add-missing-resierfs_warning-arg.patch added to -mm tree

by akpm＠linux-foundation.org

The patch titled Subject: fs/reiserfs/journal.c: add missing resierfs_warning() arg has been added to the -mm tree. Its filename is fs-reiserfs-journalc-add-missing-resierfs_warning-arg.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fs-reiserfs-journalc-add-missing-r… and later at http://ozlabs.org/~akpm/mmotm/broken-out/fs-reiserfs-journalc-add-missing-r… Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm(a)linux-foundation.org> Subject: fs/reiserfs/journal.c: add missing resierfs_warning() arg One use of the reiserfs_warning() macro in journal_init_dev() is missing a parameter, causing the following warning: REISERFS warning (device loop0): journal_init_dev: Cannot open '%s': %i journal_init_dev: This also causes a WARN_ONCE() warning in the vsprintf code, and then a panic if panic_on_warn is set. Please remove unsupported %/ in format string WARNING: CPU: 1 PID: 4480 at lib/vsprintf.c:2138 format_decode+0x77f/0x830 lib/vsprintf.c:2138 Kernel panic - not syncing: panic_on_warn set ... Just add another string argument to the macro invocation. Addresses https://syzkaller.appspot.com/bug?id=0627d4551fdc39bf1ef5d82cd9eef587047f77… Link: http://lkml.kernel.org/r/d678ebe1-6f54-8090-df4c-b9affad62293@infradead.org Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Reported-by: <syzbot+6bd77b88c1977c03f584(a)syzkaller.appspotmail.com> Tested-by: Randy Dunlap <rdunlap(a)infradead.org> Acked-by: Jeff Mahoney <jeffm(a)suse.com> Cc: Alexander Viro <viro(a)zeniv.linux.org.uk> Cc: Jan Kara <jack(a)suse.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> --- fs/reiserfs/journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/reiserfs/journal.c~fs-reiserfs-journalc-add-missing-resierfs_warning-arg fs/reiserfs/journal.c --- a/fs/reiserfs/journal.c~fs-reiserfs-journalc-add-missing-resierfs_warning-arg +++ a/fs/reiserfs/journal.c @@ -2643,7 +2643,7 @@ static int journal_init_dev(struct super if (IS_ERR(journal->j_dev_bd)) { result = PTR_ERR(journal->j_dev_bd); journal->j_dev_bd = NULL; - reiserfs_warning(super, + reiserfs_warning(super, "sh-457", "journal_init_dev: Cannot open '%s': %i", jdev_name, result); return result; _ Patches currently in -mm which might be from akpm(a)linux-foundation.org are i-need-old-gcc.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch mm.patch z3fold-fix-memory-leak-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch fs-reiserfs-journalc-add-missing-resierfs_warning-arg.patch ipc-shmc-shm_split-remove-unneeded-test-for-null-shm_file_datavm_ops.patch linux-next-rejects.patch linux-next-git-rejects.patch linux-next-fixup.patch fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch

7 years, 7 months

1
0
0 0

[PATCH v2] clk: bcm2835: De-assert/assert PLL reset signal when appropriate

by Boris Brezillon

In order to enable a PLL, not only the PLL has to be powered up and locked, but you also have to de-assert the reset signal. The last part was missing. Add it so PLLs that were not enabled by the FW/bootloader can be enabled from Linux. Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the audio domain clocks") Cc: <stable(a)vger.kernel.org> Signed-off-by: Boris Brezillon <boris.brezillon(a)bootlin.com> --- Changes in v2: - simplify bcm2835_pll_off() --- drivers/clk/bcm/clk-bcm2835.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index a07f6451694a..fa0d5c8611a0 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -602,9 +602,7 @@ static void bcm2835_pll_off(struct clk_hw *hw) const struct bcm2835_pll_data *data = pll->data; spin_lock(&cprman->regs_lock); - cprman_write(cprman, data->cm_ctrl_reg, - cprman_read(cprman, data->cm_ctrl_reg) | - CM_PLL_ANARST); + cprman_write(cprman, data->cm_ctrl_reg, CM_PLL_ANARST); cprman_write(cprman, data->a2w_ctrl_reg, cprman_read(cprman, data->a2w_ctrl_reg) | A2W_PLL_CTRL_PWRDN); @@ -640,6 +638,10 @@ static int bcm2835_pll_on(struct clk_hw *hw) cpu_relax(); } + cprman_write(cprman, data->a2w_ctrl_reg, + cprman_read(cprman, data->a2w_ctrl_reg) | + A2W_PLL_CTRL_PRST_DISABLE); + return 0; } -- 2.14.1

7 years, 7 months

3
2
0 0

[PATCH 4.9 000/145] 4.9.84-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.84 release. There are 145 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sun Feb 25 17:06:27 UTC 2018. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.84-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.84-rc1 Kamil Konieczny <k.konieczny(a)partner.samsung.com> crypto: s5p-sss - Fix kernel Oops in AES-ECB mode Jan Dakinevich <jan.dakinevich(a)gmail.com> KVM: nVMX: invvpid handling improvements Jan Dakinevich <jan.dakinevich(a)gmail.com> KVM: VMX: clean up declaration of VPID/EPT invalidation types Wanpeng Li <wanpeng.li(a)hotmail.com> KVM: async_pf: Fix #DF due to inject "Page not Present" and "Page Ready" exceptions simultaneously Borislav Petkov <bp(a)suse.de> x86/microcode/AMD: Change load_microcode_amd()'s param to bool to fix preemptibility bug Arnd Bergmann <arnd(a)arndb.de> usb: phy: msm add regulator dependency Arnd Bergmann <arnd(a)arndb.de> arm64: fix warning about swapper_pg_dir overflow Arnd Bergmann <arnd(a)arndb.de> idle: i7300: add PCI dependency Arnd Bergmann <arnd(a)arndb.de> spi: bcm-qspi: shut up warning about cfi header inclusion Arnd Bergmann <arnd(a)arndb.de> binfmt_elf: compat: avoid unused function warning Arnd Bergmann <arnd(a)arndb.de> arm64: sunxi: always enable reset controller Arnd Bergmann <arnd(a)arndb.de> drm/i915: hide unused intel_panel_set_backlight function Arnd Bergmann <arnd(a)arndb.de> kasan: rework Kconfig settings Tobias Regnery <tobias.regnery(a)gmail.com> clk: meson: gxbb: fix build error without RESET_CONTROLLER Arnd Bergmann <arnd(a)arndb.de> ISDN: eicon: reduce stack size of sig_ind function Arnd Bergmann <arnd(a)arndb.de> tw5864: use dev_warn instead of WARN to shut up warning Arnd Bergmann <arnd(a)arndb.de> em28xx: only use mt9v011 if camera support is enabled Arnd Bergmann <arnd(a)arndb.de> go7007: add MEDIA_CAMERA_SUPPORT dependency Arnd Bergmann <arnd(a)arndb.de> tc358743: fix register i2c_rd/wr functions Jérémy Lefaure <jeremy.lefaure(a)lse.epita.fr> shmem: fix compilation warnings on unused functions Arnd Bergmann <arnd(a)arndb.de> KVM: add X86_LOCAL_APIC dependency Arnd Bergmann <arnd(a)arndb.de> Input: tca8418_keypad - hide gcc-4.9 -Wmaybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> drm/nouveau: hide gcc-4.9 -Wmaybe-uninitialized Ilya Dryomov <idryomov(a)gmail.com> rbd: silence bogus -Wmaybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> drm: exynos: mark pm functions as __maybe_unused Arnd Bergmann <arnd(a)arndb.de> security/keys: BIG_KEY requires CONFIG_CRYPTO Arnd Bergmann <arnd(a)arndb.de> cw1200: fix bogus maybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> reiserfs: avoid a -Wmaybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> ALSA: hda/ca0132 - fix possible NULL pointer use Kefeng Wang <wangkefeng.wang(a)huawei.com> arm64: Kconfig: select COMPAT_BINFMT_ELF only when BINFMT_ELF is set Arnd Bergmann <arnd(a)arndb.de> scsi: advansys: fix uninitialized data access Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> x86/vm86: Fix unused variable warning if THP is disabled Arnd Bergmann <arnd(a)arndb.de> x86/platform: Add PCI dependency for PUNIT_ATOM_DEBUG Jun Nie <jun.nie(a)linaro.org> dmaengine: zx: fix build warning Arnd Bergmann <arnd(a)arndb.de> x86: add MULTIUSER dependency for KVM Arnd Bergmann <arnd(a)arndb.de> thermal: fix INTEL_SOC_DTS_IOSF_CORE dependencies Arnd Bergmann <arnd(a)arndb.de> x86/build: Silence the build with "make -s" Josh Poimboeuf <jpoimboe(a)redhat.com> tools build: Add tools tree support for 'make -s' Arnd Bergmann <arnd(a)arndb.de> x86/fpu/math-emu: Fix possible uninitialized variable use Arnd Bergmann <arnd(a)arndb.de> arm64: define BUG() instruction without CONFIG_BUG Arnd Bergmann <arnd(a)arndb.de> gpio: xgene: mark PM functions as __maybe_unused Borislav Petkov <bp(a)suse.de> x86/ras/inject: Make it depend on X86_LOCAL_APIC=y Arnd Bergmann <arnd(a)arndb.de> scsi: advansys: fix build warning for PCI=n Arnd Bergmann <arnd(a)arndb.de> video: fbdev: via: remove possibly unused variables Stephen Boyd <sboyd(a)codeaurora.org> perf: xgene: Include module.h Marc Gonzalez <marc_gonzalez(a)sigmadesigns.com> PCI: Change pci_host_common_probe() visibility Jérémy Lefaure <jeremy.lefaure(a)lse.epita.fr> usb: musb: fix compilation warning on unused function Borislav Petkov <bp(a)suse.de> platform/x86: intel_mid_thermal: Fix suspend handlers unused warning Augusto Mecking Caringi <augustocaringi(a)gmail.com> gpio: intel-mid: Fix build warning when !CONFIG_PM Borislav Petkov <bp(a)suse.de> PCI: vmd: Fix suspend handlers defined-but-not-used warning Arnd Bergmann <arnd(a)arndb.de> perf/x86: Shut up false-positive -Wmaybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> vmxnet3: prevent building with 64K pages Tobias Regnery <tobias.regnery(a)gmail.com> clk: sunxi-ng: fix build error without CONFIG_RESET_CONTROLLER Arnd Bergmann <arnd(a)arndb.de> shmem: avoid maybe-uninitialized warning Arnd Bergmann <arnd(a)arndb.de> drm/i915: fix intel_backlight_device_register declaration LEROY Christophe <christophe.leroy(a)c-s.fr> crypto: talitos - fix Kernel Oops on hashing an empty file Nicholas Piggin <npiggin(a)gmail.com> powerpc/64s: Improve RFI L1-D cache flush fallback Nicholas Piggin <npiggin(a)gmail.com> powerpc/64s: Simple RFI macro conversions Michael Ellerman <mpe(a)ellerman.id.au> powerpc/64s: Fix conversion of slb_miss_common to use RFI_TO_USER/KERNEL Jia-Ju Bai <baijiaju1990(a)163.com> hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close Jan Beulich <JBeulich(a)suse.com> xen: XEN_ACPI_PROCESSOR is Dom0-only Pali Rohár <pali.rohar(a)gmail.com> platform/x86: dell-laptop: Fix keyboard max lighting for Dell Latitude E6410 Karol Herbst <kherbst(a)redhat.com> x86/mm/kmmio: Fix mmiotrace for page unaligned addresses Dave Young <dyoung(a)redhat.com> mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Andreas Platschek <andreas.platschek(a)opentech.at> usb: dwc3: of-simple: fix missing clk_disable_unprepare Vincent Pelletier <plr.vincent(a)gmail.com> usb: dwc3: gadget: Wait longer for controller to end command processing Tobias Jordan <Tobias.Jordan(a)elektrobit.com> dmaengine: jz4740: disable/unprepare clk if probe fails Russell King <rmk+kernel(a)armlinux.org.uk> drm/armada: fix leak of crtc structure Steffen Klassert <steffen.klassert(a)secunet.com> xfrm: Fix stack-out-of-bounds with misconfigured transport mode policies. Takuo Koguchi <takuo.koguchi(a)gmail.com> spi: sun4i: disable clocks in the remove function Stefan Potyra <Stefan.Potyra(a)elektrobit.com> ASoC: rockchip: disable clock on error Cai Li <cai.li(a)spreadtrum.com> clk: fix a panic error caused by accessing NULL pointer Gustavo A. R. Silva <garsilva(a)embeddedor.com> dmaengine: at_hdmac: fix potential NULL pointer dereference in atc_prep_dma_interleaved Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> dmaengine: ioat: Fix error handling path Claudiu Manoil <claudiu.manoil(a)nxp.com> gianfar: Disable EEE autoneg by default Eric Biggers <ebiggers3(a)gmail.com> 509: fix printing uninitialized stack memory when OID is empty Branislav Radocaj <branislav(a)radocaj.org> net: ethernet: arc: fix error handling in emac_rockchip_probe Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> brcmfmac: Avoid build error with make W=1 Nikolay Borisov <nborisov(a)suse.com> btrfs: Fix possible off-by-one in btrfs_search_path_in_tree Nogah Frankel <nogahf(a)mellanox.com> net_sched: red: Avoid illegal values Nogah Frankel <nogahf(a)mellanox.com> net_sched: red: Avoid devision by zero Zumeng Chen <zumeng.chen(a)gmail.com> gianfar: fix a flooded alignment reports because of padding issue. Tony Lindgren <tony(a)atomide.com> ARM: dts: Fix elm interrupt compiler warning Stefan Haberland <sth(a)linux.vnet.ibm.com> s390/dasd: prevent prefix I/O error Ravi Bangoria <ravi.bangoria(a)linux.vnet.ibm.com> powerpc/perf: Fix oops when grouping different pmu events Greg Ungerer <gerg(a)linux-m68k.org> m68k: add missing SOFTIRQENTRY_TEXT linker section Gao Feng <gfree.wind(a)vip.163.com> ipvlan: Add the skb->mark as flow4's member to lookup route Will Deacon <will.deacon(a)arm.com> scripts/kernel-doc: Don't fail with status != 0 if error encountered with -none Xin Long <lucien.xin(a)gmail.com> sctp: only update outstanding_bytes for transmitted queue when doing prsctp_prune Moni Shoua <monis(a)mellanox.com> RDMA/cma: Make sure that PSN is not over max allowed Mustafa Ismail <mustafa.ismail(a)intel.com> i40iw: Correct ARP index mask Andre Przywara <andre.przywara(a)arm.com> pinctrl: sunxi: Fix A64 UART mux value Andre Przywara <andre.przywara(a)arm.com> pinctrl: sunxi: Fix A80 interrupt pin bank Mauro Carvalho Chehab <mchehab(a)kernel.org> media: s5k6aa: describe some function parameters Satheesh Rajendran <sathnaga(a)linux.vnet.ibm.com> perf bench numa: Fixup discontiguous/sparse numa nodes Jiri Olsa <jolsa(a)kernel.org> perf top: Fix window dimensions change handling Peter Ujfalusi <peter.ujfalusi(a)ti.com> ARM: dts: am437x-cm-t43: Correct the dmas property of spi0 Peter Ujfalusi <peter.ujfalusi(a)ti.com> ARM: dts: am4372: Correct the interrupts_properties of McASP Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-somlv: Fix wl127x pinmux Adam Ford <aford173(a)gmail.com> ARM: dts: logicpd-som-lv: Fix gpmc addresses for NAND and enet Tony Lindgren <tony(a)atomide.com> ARM: dts: Fix omap4 hang with GPS connected to USB by using wakeupgen Keerthy <j-keerthy(a)ti.com> ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function Tony Lindgren <tony(a)atomide.com> ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context Randy Dunlap <rdunlap(a)infradead.org> usb: build drivers/usb/common/ when USB_SUPPORT is set Shuah Khan <shuah(a)kernel.org> usbip: keep usbip_device sockfd state in sync with tcp_socket Alexandru Ardelean <alexandru.ardelean(a)analog.com> staging: iio: ad5933: switch buffer mode to software Alexandru Ardelean <alexandru.ardelean(a)analog.com> staging: iio: adc: ad7192: fix external frequency setting Eric Biggers <ebiggers(a)google.com> binder: check for binder_thread allocation failure in binder_poll() Ben Hutchings <ben(a)decadent.org.uk> staging: android: ashmem: Fix a race condition in pin ioctls Paolo Abeni <pabeni(a)redhat.com> dn_getsockoptdecnet: move nf_{get/set}sockopt outside sock lock Arnd Bergmann <arnd(a)arndb.de> arm64: dts: add #cooling-cells to CPU nodes Arnd Bergmann <arnd(a)arndb.de> ARM: 8743/1: bL_switcher: add MODULE_LICENSE tag Arnd Bergmann <arnd(a)arndb.de> video: fbdev/mmp: add MODULE_LICENSE Arnd Bergmann <arnd(a)arndb.de> ASoC: ux500: add MODULE_LICENSE tag Eric Biggers <ebiggers(a)google.com> crypto: hash - prevent using keyed hashes without setting key Eric Biggers <ebiggers(a)google.com> crypto: hash - annotate algorithms taking optional key Willem de Bruijn <willemb(a)google.com> net: avoid skb_warn_bad_offload on IS_ERR Sowmini Varadhan <sowmini.varadhan(a)oracle.com> rds: tcp: atomically purge entries from rds_tcp_conn_list during netns delete Cong Wang <xiyou.wangcong(a)gmail.com> netfilter: xt_RATEEST: acquire xt_rateest_mutex for hash insert Cong Wang <xiyou.wangcong(a)gmail.com> netfilter: xt_cgroup: initialize info->priv in cgroup_mt_check_v1() Paolo Abeni <pabeni(a)redhat.com> netfilter: on sockopt() acquire sock lock only in the required scope Dmitry Vyukov <dvyukov(a)google.com> netfilter: ipt_CLUSTERIP: fix out-of-bounds accesses in clusterip_tg_check() Eric Dumazet <edumazet(a)google.com> netfilter: x_tables: avoid out-of-bounds reads in xt_request_find_{match|target} Dmitry Vyukov <dvyukov(a)google.com> netfilter: x_tables: fix int overflow in xt_alloc_table_info() Dmitry Vyukov <dvyukov(a)google.com> kcov: detect double association with a single task Wanpeng Li <wanpeng.li(a)hotmail.com> KVM: x86: fix escape of guest dr6 to the host Douglas Gilbert <dgilbert(a)interlog.com> blk_rq_map_user_iov: fix error override Laura Abbott <labbott(a)redhat.com> staging: android: ion: Switch from WARN to pr_warn Laura Abbott <labbott(a)redhat.com> staging: android: ion: Add __GFP_NOWARN for system contig heap Eric Biggers <ebiggers(a)google.com> crypto: x86/twofish-3way - Fix %rbp usage Paul Moore <paul(a)paul-moore.com> selinux: skip bounded transition processing if the policy isn't loaded Paul Moore <paul(a)paul-moore.com> selinux: ensure the context is NUL terminated in security_context_to_sid_core() David Howells <dhowells(a)redhat.com> Provide a function to create a NUL-terminated string from unterminated data Jason Wang <jasowang(a)redhat.com> ptr_ring: fail early if queue occupies more than KMALLOC_MAX_SIZE Chris Wilson <chris(a)chris-wilson.co.uk> drm: Require __GFP_NOFAIL for the legacy drm_modeset_lock_all Jens Axboe <axboe(a)kernel.dk> blktrace: fix unlocked registration of tracepoints Xin Long <lucien.xin(a)gmail.com> sctp: set frag_point in sctp_setsockopt_maxseg correctly Cong Wang <xiyou.wangcong(a)gmail.com> xfrm: check id proto in validate_tmpl() Steffen Klassert <steffen.klassert(a)secunet.com> xfrm: Fix stack-out-of-bounds read on socket policy lookup. Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed. Florian Westphal <fw(a)strlen.de> xfrm: skip policies marked as dead while rehashing Johannes Berg <johannes.berg(a)intel.com> cfg80211: check dev_set_name() return value Tom Herbert <tom(a)quantonium.net> kcm: Only allow TCP sockets to be attached to a KCM mux Tom Herbert <tom(a)quantonium.net> kcm: Check if sk_user_data already set in kcm_attach Jason Wang <jasowang(a)redhat.com> vhost: use mutex_lock_nested() in vhost_dev_lock_vqs() ------------- Diffstat: Makefile | 10 +- arch/arm/boot/dts/am4372.dtsi | 6 +- arch/arm/boot/dts/am437x-cm-t43.dts | 4 +- arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 3 +- arch/arm/boot/dts/logicpd-som-lv.dtsi | 16 +-- arch/arm/boot/dts/omap4.dtsi | 4 +- arch/arm/common/bL_switcher_dummy_if.c | 4 + arch/arm/mach-omap2/omap-secure.c | 19 ++++ arch/arm/mach-omap2/omap-secure.h | 4 + arch/arm/mach-omap2/pm.h | 4 - arch/arm/mach-omap2/pm34xx.c | 13 +-- arch/arm/mach-omap2/prm33xx.c | 12 --- arch/arm/mach-omap2/sleep34xx.S | 26 +---- arch/arm64/Kconfig | 2 +- arch/arm64/Kconfig.platforms | 2 + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 + arch/arm64/crypto/crc32-arm64.c | 2 + arch/arm64/include/asm/bug.h | 33 +++--- arch/arm64/mm/mmu.c | 2 +- arch/m68k/kernel/vmlinux-nommu.lds | 2 + arch/m68k/kernel/vmlinux-std.lds | 2 + arch/m68k/kernel/vmlinux-sun3.lds | 2 + arch/powerpc/crypto/crc32c-vpmsum_glue.c | 1 + arch/powerpc/include/asm/exception-64s.h | 2 +- arch/powerpc/include/asm/paca.h | 3 +- arch/powerpc/kernel/asm-offsets.c | 3 +- arch/powerpc/kernel/entry_64.S | 9 +- arch/powerpc/kernel/exceptions-64s.S | 99 +++++++++--------- arch/powerpc/kernel/idle_book3s.S | 7 +- arch/powerpc/kernel/setup_64.c | 13 +-- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 7 +- arch/powerpc/kvm/book3s_rmhandlers.S | 7 +- arch/powerpc/kvm/book3s_segment.S | 4 +- arch/powerpc/perf/core-book3s.c | 4 +- arch/s390/crypto/crc32-vx.c | 3 + arch/sparc/crypto/crc32c_glue.c | 1 + arch/x86/Kconfig | 2 +- arch/x86/Kconfig.debug | 1 + arch/x86/boot/Makefile | 5 +- arch/x86/crypto/crc32-pclmul_glue.c | 1 + arch/x86/crypto/crc32c-intel_glue.c | 1 + arch/x86/crypto/twofish-x86_64-asm_64-3way.S | 112 +++++++++++---------- arch/x86/events/core.c | 4 +- arch/x86/include/asm/microcode_amd.h | 1 - arch/x86/include/asm/vmx.h | 5 +- arch/x86/kernel/cpu/mcheck/mce-inject.c | 5 +- arch/x86/kernel/cpu/microcode/amd.c | 17 ++-- arch/x86/kernel/vm86_32.c | 5 +- arch/x86/kvm/Kconfig | 3 +- arch/x86/kvm/vmx.c | 36 ++++--- arch/x86/kvm/x86.c | 40 ++++++-- arch/x86/math-emu/Makefile | 4 +- arch/x86/math-emu/reg_compare.c | 16 +-- arch/x86/mm/ioremap.c | 4 +- arch/x86/mm/kmmio.c | 12 ++- block/blk-map.c | 4 +- crypto/ahash.c | 22 +++- crypto/algif_hash.c | 52 ++-------- crypto/crc32_generic.c | 1 + crypto/crc32c_generic.c | 1 + crypto/cryptd.c | 7 +- crypto/mcryptd.c | 7 +- crypto/shash.c | 25 ++++- drivers/Makefile | 1 + drivers/android/binder.c | 2 + drivers/block/rbd.c | 2 +- drivers/clk/meson/Kconfig | 1 + drivers/clk/sunxi-ng/Kconfig | 1 + drivers/crypto/bfin_crc.c | 3 +- drivers/crypto/s5p-sss.c | 12 ++- drivers/crypto/talitos.c | 5 + drivers/dma/at_hdmac.c | 4 +- drivers/dma/dma-jz4740.c | 4 +- drivers/dma/ioat/init.c | 2 +- drivers/dma/zx296702_dma.c | 2 +- drivers/gpio/gpio-intel-mid.c | 2 +- drivers/gpio/gpio-xgene.c | 13 +-- drivers/gpu/drm/armada/armada_crtc.c | 25 ++--- drivers/gpu/drm/drm_modeset_lock.c | 2 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_panel.c | 86 ++++++++-------- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- drivers/idle/Kconfig | 1 + drivers/infiniband/core/cma.c | 1 + drivers/infiniband/hw/i40iw/i40iw_d.h | 2 +- drivers/input/keyboard/tca8418_keypad.c | 21 ++-- drivers/isdn/hardware/eicon/message.c | 16 +-- drivers/media/i2c/s5k6aa.c | 5 + drivers/media/i2c/tc358743.c | 46 +++++---- drivers/media/pci/tw5864/tw5864-video.c | 6 +- drivers/media/usb/em28xx/Kconfig | 2 +- drivers/media/usb/go7007/Kconfig | 2 +- drivers/net/Kconfig | 3 + drivers/net/ethernet/arc/emac_rockchip.c | 7 +- drivers/net/ethernet/freescale/gianfar.c | 11 +- drivers/net/hippi/rrunner.c | 2 +- drivers/net/ipvlan/ipvlan_core.c | 1 + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- drivers/net/wireless/st/cw1200/wsm.c | 8 +- drivers/pci/host/vmd.c | 2 +- drivers/perf/xgene_pmu.c | 1 + drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c | 2 +- drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 6 +- drivers/platform/x86/dell-laptop.c | 17 ++++ drivers/platform/x86/intel_mid_thermal.c | 2 + drivers/s390/block/dasd_eckd.c | 16 +-- drivers/scsi/advansys.c | 24 +++-- drivers/spi/Kconfig | 1 + drivers/spi/spi-sun4i.c | 2 +- drivers/staging/android/ashmem.c | 19 ++-- drivers/staging/android/ion/ion-ioctl.c | 4 +- drivers/staging/android/ion/ion_system_heap.c | 2 +- drivers/staging/iio/adc/ad7192.c | 27 +++-- drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +- .../lustre/lnet/libcfs/linux/linux-crypto-adler.c | 1 + drivers/thermal/Kconfig | 4 +- drivers/usb/dwc3/dwc3-of-simple.c | 4 +- drivers/usb/dwc3/gadget.c | 2 +- drivers/usb/musb/musb_core.c | 2 + drivers/usb/phy/Kconfig | 1 + drivers/usb/usbip/stub_dev.c | 3 + drivers/usb/usbip/vhci_hcd.c | 2 + drivers/vhost/vhost.c | 2 +- drivers/video/fbdev/mmp/core.c | 5 + drivers/video/fbdev/via/viafbdev.c | 8 +- drivers/xen/Kconfig | 2 +- fs/btrfs/ioctl.c | 2 +- fs/compat_binfmt_elf.c | 2 + fs/reiserfs/lbalance.c | 2 +- fs/reiserfs/reiserfs.h | 1 - include/crypto/hash.h | 34 +++++-- include/linux/crypto.h | 8 ++ include/linux/pci-ecam.h | 2 +- include/linux/ptr_ring.h | 2 + include/linux/string.h | 1 + include/net/red.h | 13 ++- include/net/sctp/sctp.h | 3 +- include/trace/events/clk.h | 4 +- kernel/kcov.c | 4 +- kernel/trace/blktrace.c | 32 ++++-- lib/Kconfig.debug | 1 - lib/oid_registry.c | 8 +- mm/early_ioremap.c | 2 +- mm/shmem.c | 6 +- mm/util.c | 24 +++++ mm/vmscan.c | 3 + net/core/dev.c | 2 +- net/decnet/af_decnet.c | 62 ++++++------ net/ipv4/ip_sockglue.c | 14 +-- net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 ++- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +- net/ipv6/ipv6_sockglue.c | 17 +--- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 ++-- net/kcm/kcmsock.c | 25 ++++- net/netfilter/x_tables.c | 10 +- net/netfilter/xt_RATEEST.c | 22 +++- net/netfilter/xt_cgroup.c | 1 + net/rds/tcp.c | 9 +- net/rds/tcp.h | 1 + net/sched/sch_choke.c | 3 + net/sched/sch_gred.c | 3 + net/sched/sch_red.c | 2 + net/sched/sch_sfq.c | 3 + net/sctp/outqueue.c | 6 +- net/sctp/socket.c | 29 ++++-- net/wireless/core.c | 8 +- net/xfrm/xfrm_policy.c | 11 +- net/xfrm/xfrm_user.c | 24 +++++ scripts/kernel-doc | 2 +- security/keys/Kconfig | 1 + security/selinux/ss/services.c | 21 ++-- sound/pci/hda/patch_ca0132.c | 3 + sound/soc/rockchip/rockchip_spdif.c | 18 +++- sound/soc/ux500/mop500.c | 4 + sound/soc/ux500/ux500_pcm.c | 5 + tools/build/Makefile.build | 10 ++ tools/perf/bench/numa.c | 56 ++++++++++- tools/perf/builtin-top.c | 15 ++- tools/scripts/Makefile.include | 12 ++- 180 files changed, 1121 insertions(+), 680 deletions(-)

7 years, 7 months

7
131
0 0

[PATCH v4 4/6] PCI: aardvark: Fix PCIe Max Read Request Size setting

by Thomas Petazzoni

From: Evan Wang <xswang(a)marvell.com> There is an obvious typo issue in the definition of the PCIe maximum read request size: a bit shift is directly used as a value, while it should be used to shift the correct value. Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") Cc: <stable(a)vger.kernel.org> Signed-off-by: Evan Wang <xswang(a)marvell.com> Reviewed-by: Victor Gu <xigu(a)marvell.com> Reviewed-by: Nadav Haklai <nadavh(a)marvell.com> [Thomas: tweak commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- drivers/pci/host/pci-aardvark.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index 7a0ddb709052..9abf549631b4 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -29,6 +29,7 @@ #define PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT 5 #define PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE (0 << 11) #define PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT 12 +#define PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SZ 0x2 #define PCIE_CORE_LINK_CTRL_STAT_REG 0xd0 #define PCIE_CORE_LINK_L0S_ENTRY BIT(0) #define PCIE_CORE_LINK_TRAINING BIT(5) @@ -295,7 +296,8 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie) reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE | (7 << PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT) | PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE | - PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT; + (PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SZ << + PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT); advk_writel(pcie, reg, PCIE_CORE_DEV_CTRL_STATS_REG); /* Program PCIe Control 2 to disable strict ordering */ -- 2.14.3

7 years, 7 months

1
0
0 0

[PATCH v4 3/6] PCI: aardvark: Use ISR1 instead of ISR0 interrupt in legacy irq mode

by Thomas Petazzoni

From: Victor Gu <xigu(a)marvell.com> The Aardvark has two interrupts sets: - first set is bit[23:16] of PCIe ISR 0 register(RD0074840h) - second set is bit[11:8] of PCIe ISR 1 register(RD0074848h) Only one set should be used, while another set should be masked. The second set, ISR1, is more advanced, the Legacy INT_X status bit is asserted once Assert_INTX message is received, and de-asserted after Deassert_INTX message is received. Therefore, it matches what the driver is currently doing in the ->irq_mask() and ->irq_unmask() functions. The ISR0 requires additional work to deassert the interrupt, which the driver doesn't do currently. This commit resolves a number of issues with legacy interrupts. This is part of fixing bug https://bugzilla.kernel.org/show_bug.cgi?id=196339, this commit was reported as the user to be important to get a Intel 7260 mini-PCIe WiFi card working. Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") Cc: <stable(a)vger.kernel.org> Signed-off-by: Victor Gu <xigu(a)marvell.com> Reviewed-by: Evan Wang <xswang(a)marvell.com> Reviewed-by: Nadav Haklai <nadavh(a)marvell.com> [Thomas: tweak commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- drivers/pci/host/pci-aardvark.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index 5b8201aaf34d..7a0ddb709052 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -100,7 +100,8 @@ #define PCIE_ISR1_MASK_REG (CONTROL_BASE_ADDR + 0x4C) #define PCIE_ISR1_POWER_STATE_CHANGE BIT(4) #define PCIE_ISR1_FLUSH BIT(5) -#define PCIE_ISR1_ALL_MASK GENMASK(5, 4) +#define PCIE_ISR1_INTX_ASSERT(val) BIT(8 + (val)) +#define PCIE_ISR1_ALL_MASK GENMASK(11, 4) #define PCIE_MSI_ADDR_LOW_REG (CONTROL_BASE_ADDR + 0x50) #define PCIE_MSI_ADDR_HIGH_REG (CONTROL_BASE_ADDR + 0x54) #define PCIE_MSI_STATUS_REG (CONTROL_BASE_ADDR + 0x58) @@ -607,9 +608,9 @@ static void advk_pcie_irq_mask(struct irq_data *d) irq_hw_number_t hwirq = irqd_to_hwirq(d); u32 mask; - mask = advk_readl(pcie, PCIE_ISR0_MASK_REG); - mask |= PCIE_ISR0_INTX_ASSERT(hwirq); - advk_writel(pcie, mask, PCIE_ISR0_MASK_REG); + mask = advk_readl(pcie, PCIE_ISR1_MASK_REG); + mask |= PCIE_ISR1_INTX_ASSERT(hwirq); + advk_writel(pcie, mask, PCIE_ISR1_MASK_REG); } static void advk_pcie_irq_unmask(struct irq_data *d) @@ -618,9 +619,9 @@ static void advk_pcie_irq_unmask(struct irq_data *d) irq_hw_number_t hwirq = irqd_to_hwirq(d); u32 mask; - mask = advk_readl(pcie, PCIE_ISR0_MASK_REG); - mask &= ~PCIE_ISR0_INTX_ASSERT(hwirq); - advk_writel(pcie, mask, PCIE_ISR0_MASK_REG); + mask = advk_readl(pcie, PCIE_ISR1_MASK_REG); + mask &= ~PCIE_ISR1_INTX_ASSERT(hwirq); + advk_writel(pcie, mask, PCIE_ISR1_MASK_REG); } static int advk_pcie_irq_map(struct irq_domain *h, @@ -763,29 +764,35 @@ static void advk_pcie_handle_msi(struct advk_pcie *pcie) static void advk_pcie_handle_int(struct advk_pcie *pcie) { - u32 val, mask, status; + u32 isr0_val, isr0_mask, isr0_status; + u32 isr1_val, isr1_mask, isr1_status; int i, virq; - val = advk_readl(pcie, PCIE_ISR0_REG); - mask = advk_readl(pcie, PCIE_ISR0_MASK_REG); - status = val & ((~mask) & PCIE_ISR0_ALL_MASK); + isr0_val = advk_readl(pcie, PCIE_ISR0_REG); + isr0_mask = advk_readl(pcie, PCIE_ISR0_MASK_REG); + isr0_status = isr0_val & ((~isr0_mask) & PCIE_ISR0_ALL_MASK); - if (!status) { - advk_writel(pcie, val, PCIE_ISR0_REG); + isr1_val = advk_readl(pcie, PCIE_ISR1_REG); + isr1_mask = advk_readl(pcie, PCIE_ISR1_MASK_REG); + isr1_status = isr1_val & ((~isr1_mask) & PCIE_ISR1_ALL_MASK); + + if (!isr0_status && !isr1_status) { + advk_writel(pcie, isr0_val, PCIE_ISR0_REG); + advk_writel(pcie, isr1_val, PCIE_ISR1_REG); return; } /* Process MSI interrupts */ - if (status & PCIE_ISR0_MSI_INT_PENDING) + if (isr0_status & PCIE_ISR0_MSI_INT_PENDING) advk_pcie_handle_msi(pcie); /* Process legacy interrupts */ for (i = 0; i < PCI_NUM_INTX; i++) { - if (!(status & PCIE_ISR0_INTX_ASSERT(i))) + if (!(isr1_status & PCIE_ISR1_INTX_ASSERT(i))) continue; - advk_writel(pcie, PCIE_ISR0_INTX_ASSERT(i), - PCIE_ISR0_REG); + advk_writel(pcie, PCIE_ISR1_INTX_ASSERT(i), + PCIE_ISR1_REG); virq = irq_find_mapping(pcie->irq_domain, i); generic_handle_irq(virq); -- 2.14.3

7 years, 7 months

1
0
0 0

[PATCH v4 2/6] PCI: aardvark: Set PIO_ADDR_LS correctly in advk_pcie_rd_conf()

by Thomas Petazzoni

From: Victor Gu <xigu(a)marvell.com> When setting the PIO_ADDR_LS register during a configuration read, we were properly passing the device number, function number and register number, but not the bus number, causing issues when reading the configuration of PCIe devices. Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") Cc: <stable(a)vger.kernel.org> Signed-off-by: Victor Gu <xigu(a)marvell.com> Reviewed-by: Wilson Ding <dingwei(a)marvell.com> Reviewed-by: Nadav Haklai <nadavh(a)marvell.com> [Thomas: tweak commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- Changes since v2: - Drop PCIE_BDF() macro, since it's no longer used. Noticed by Bjorn Helgaas. --- drivers/pci/host/pci-aardvark.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index b72f15c99793..5b8201aaf34d 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -172,8 +172,6 @@ #define PCIE_CONFIG_WR_TYPE0 0xa #define PCIE_CONFIG_WR_TYPE1 0xb -/* PCI_BDF shifts 8bit, so we need extra 4bit shift */ -#define PCIE_BDF(dev) (dev << 4) #define PCIE_CONF_BUS(bus) (((bus) & 0xff) << 20) #define PCIE_CONF_DEV(dev) (((dev) & 0x1f) << 15) #define PCIE_CONF_FUNC(fun) (((fun) & 0x7) << 12) @@ -456,7 +454,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn, advk_writel(pcie, reg, PIO_CTRL); /* Program the address registers */ - reg = PCIE_BDF(devfn) | PCIE_CONF_REG(where); + reg = PCIE_CONF_ADDR(bus->number, devfn, where); advk_writel(pcie, reg, PIO_ADDR_LS); advk_writel(pcie, 0, PIO_ADDR_MS); -- 2.14.3

7 years, 7 months

1
0
0 0

[PATCH v4 1/6] PCI: aardvark: Fix logic in advk_pcie_{rd,wr}_conf()

by Thomas Petazzoni

From: Victor Gu <xigu(a)marvell.com> The PCI configuration space read/write functions were special casing the situation where PCI_SLOT(devfn) != 0, and returned PCIBIOS_DEVICE_NOT_FOUND in this case. However, while this is what is intended for the root bus, it is not intended for the child busses, as it prevents discovering devices with PCI_SLOT(x) != 0. Therefore, we return PCIBIOS_DEVICE_NOT_FOUND only if we're on the root bus. Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") Cc: <stable(a)vger.kernel.org> Signed-off-by: Victor Gu <xigu(a)marvell.com> Reviewed-by: Wilson Ding <dingwei(a)marvell.com> Reviewed-by: Nadav Haklai <nadavh(a)marvell.com> [Thomas: tweak commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- Changes since v3: - Change to no longer depend on the introduction of advk_pcie_valid_device(), which we do not want to push to stable. Changes since v2: - The logic has been factorized into a advk_pcie_valid_device() helper in a previous patch, so this patch was adjusted accordingly. --- drivers/pci/host/pci-aardvark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index b04d37b3c5de..b72f15c99793 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -437,7 +437,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn, u32 reg; int ret; - if (PCI_SLOT(devfn) != 0) { + if ((bus->number == pcie->root_bus_nr) && PCI_SLOT(devfn) != 0) { *val = 0xffffffff; return PCIBIOS_DEVICE_NOT_FOUND; } @@ -491,7 +491,7 @@ static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn, int offset; int ret; - if (PCI_SLOT(devfn) != 0) + if ((bus->number == pcie->root_bus_nr) && PCI_SLOT(devfn) != 0) return PCIBIOS_DEVICE_NOT_FOUND; if (where % size) -- 2.14.3

7 years, 7 months

1
0
0 0

[PATCH v4 1/6] PCI: aardvark: Introduce an advk_pcie_valid_device() helper

by Thomas Petazzoni

In other to mimic other PCIe host controller drivers, introduce an advk_pcie_valid_device() helper, used in the configuration read/write functions. This patch by itself is not a fix, but it is required for a follow-up patch that is a fix, hence the Fixes tag and the Cc to stable. Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver") Cc: <stable(a)vger.kernel.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> --- Changes since v3: - Make the new helper return a bool instead of int Changes since v2: - New patch --- drivers/pci/host/pci-aardvark.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index b04d37b3c5de..82bff709a4b3 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -430,6 +430,15 @@ static int advk_pcie_wait_pio(struct advk_pcie *pcie) return -ETIMEDOUT; } +static bool advk_pcie_valid_device(struct advk_pcie *pcie, struct pci_bus *bus, + int devfn) +{ + if (PCI_SLOT(devfn) != 0) + return false; + + return true; +} + static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, int size, u32 *val) { @@ -437,7 +446,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn, u32 reg; int ret; - if (PCI_SLOT(devfn) != 0) { + if (!advk_pcie_valid_device(pcie, bus, devfn)) { *val = 0xffffffff; return PCIBIOS_DEVICE_NOT_FOUND; } @@ -491,7 +500,7 @@ static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn, int offset; int ret; - if (PCI_SLOT(devfn) != 0) + if (!advk_pcie_valid_device(pcie, bus, devfn)) return PCIBIOS_DEVICE_NOT_FOUND; if (where % size) -- 2.14.3

7 years, 7 months

3
3
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror