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

[char-misc 2/2] mei: discard messages from not connected client during power down.

by Tomas Winkler

From: Alexander Usyskin <alexander.usyskin(a)intel.com> This fixes regression introduced by commit 8d52af6795c0 ("mei: speed up the power down flow") In power down or suspend flow a message can still be received from the FW because the clients fake disconnection. In normal case we interpret messages w/o destination as corrupted and link reset is performed in order to clean the channel, but during power down link reset is already in progress resulting in endless loop. To resolve the issue under power down flow we discard messages silently. Cc: <stable(a)vger.kernel.org> 4.16+ Fixes: 8d52af6795c0 ("mei: speed up the power down flow") Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199541 Signed-off-by: Alexander Usyskin <alexander.usyskin(a)intel.com> Signed-off-by: Tomas Winkler <tomas.winkler(a)intel.com> --- drivers/misc/mei/interrupt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index b0b8f18a85e3..6649f0d56d2f 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c @@ -310,8 +310,11 @@ int mei_irq_read_handler(struct mei_device *dev, if (&cl->link == &dev->file_list) { /* A message for not connected fixed address clients * should be silently discarded + * On power down client may be force cleaned, + * silently discard such messages */ - if (hdr_is_fixed(mei_hdr)) { + if (hdr_is_fixed(mei_hdr) || + dev->dev_state == MEI_DEV_POWER_DOWN) { mei_irq_discard_msg(dev, mei_hdr); ret = 0; goto reset_slots; -- 2.14.4

7 years, 1 month

1
0
0 0

[GIT PULL] commits for Linux 3.18

by Sasha Levin

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi Greg, Pleae pull commits for Linux 3.18 . I've sent a review request for all commits over a week ago and all comments were addressed. Thanks, Sasha ===== The following changes since commit 8eb1ef076bab4bd4975922a06bdffa3d40c4197c: Linux 3.18.111 (2018-05-30 07:47:45 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git tags/for-greg-3.18-04062018 for you to fetch changes up to 23429535347ee9389c70fc2be5f6fcdb9e2d5bc4: ARM: 8753/1: decompressor: add a missing parameter to the addruart macro (2018-06-02 16:53:18 -0400) - ---------------------------------------------------------------- for-greg-3.18-04062018 - ---------------------------------------------------------------- Amir Goldstein (1): fsnotify: fix ignore mask logic in send_to_group() Arnd Bergmann (2): hexagon: add memset_io() helper hexagon: export csum_partial_copy_nocheck Baolin Wang (1): parisc: time: Convert read_persistent_clock() to read_persistent_clock64() Ben Hutchings (1): drm/msm: Fix possible null dereference on failure of get_pages() Chengguang Xu (1): isofs: fix potential memory leak in mount option parsing Chris Leech (1): scsi: iscsi: respond to netlink with unicast when appropriate Colin Ian King (1): scsi: isci: Fix infinite loop in while loop Dag Moxnes (1): rds: ib: Fix missing call to rds_ib_dev_put in rds_ib_setup_qp Daniel Glöckner (1): usb: musb: fix remote wakeup racing with suspend Greg Thelen (3): ib_srpt: depend on INFINIBAND_ADDR_TRANS ib_srp: depend on INFINIBAND_ADDR_TRANS IB: make INFINIBAND_ADDR_TRANS configurable Helge Deller (2): parisc: drivers.c: Fix section mismatches parisc: Move setup_profiling_timer() out of init section Håkon Bugge (1): IB/core: Make ib_mad_client_id atomic Ilan Peer (1): mac80211: Adjust SAE authentication timeout Jakob Unterwurzacher (1): can: dev: increase bus-off message severity Jim Gill (1): scsi: vmw-pvscsi: return DID_BUS_BUSY for adapter-initated aborts Jingju Hou (1): net: phy: marvell: clear wol event before setting it John Fastabend (1): bpf: fix uninitialized variable in bpf tools Kevin Easton (1): af_key: Always verify length of provided sadb_key Mark Rutland (2): arm64: ptrace: remove addr_limit manipulation arm64: fix possible spectre-v1 in ptrace_hbp_get_event() Martin Schwidefsky (1): s390/smsgiucv: disable SMSG on module unload Masami Hiramatsu (1): selftests: ftrace: Add a testcase for multiple actions on trigger Mathieu Malaterre (2): driver core: add __printf verification to __ata_ehi_pushv_desc agp: uninorth: make two functions static Naveen N. Rao (1): powerpc/trace/syscalls: Update syscall name matching logic Peter Rosin (3): i2c: pmcmsp: return message count on master_xfer success i2c: pmcmsp: fix error return from master_xfer i2c: viperboard: return message count on master_xfer success Peter Zijlstra (1): kthread, sched/wait: Fix kthread_parkme() wait-loop Russell King (1): ARM: keystone: fix platform_domain_notifier array overrun Sekhar Nori (2): ARM: davinci: board-dm355-evm: fix broken networking ARM: davinci: board-dm646x-evm: set VPIF capture card name Sinan Kaya (1): MIPS: io: Add barrier after register read in readX() Tomi Valkeinen (1): drm/omap: fix possible NULL ref issue in tiler_reserve_2d jacek.tomaka(a)poczta.fm (1): x86/cpu/intel: Add missing TLB cpuid values Łukasz Stelmach (1): ARM: 8753/1: decompressor: add a missing parameter to the addruart macro arch/arm/boot/compressed/head.S | 16 ++++---- arch/arm/mach-davinci/board-dm355-evm.c | 6 +++ arch/arm/mach-davinci/board-dm646x-evm.c | 3 +- arch/arm/mach-keystone/pm_domain.c | 1 + arch/arm64/kernel/ptrace.c | 20 +++++----- arch/hexagon/include/asm/io.h | 6 +++ arch/hexagon/lib/checksum.c | 1 + arch/mips/include/asm/io.h | 2 + arch/parisc/kernel/drivers.c | 7 ++-- arch/parisc/kernel/smp.c | 3 +- arch/parisc/kernel/time.c | 2 +- arch/powerpc/include/asm/ftrace.h | 10 ++--- arch/x86/kernel/cpu/intel.c | 3 ++ drivers/ata/libata-eh.c | 4 +- drivers/char/agp/uninorth-agp.c | 4 +- drivers/gpu/drm/msm/msm_gem.c | 20 +++++----- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 6 ++- drivers/i2c/busses/i2c-pmcmsp.c | 4 +- drivers/i2c/busses/i2c-viperboard.c | 2 +- drivers/infiniband/Kconfig | 5 ++- drivers/infiniband/core/mad.c | 4 +- drivers/infiniband/ulp/srp/Kconfig | 2 +- drivers/infiniband/ulp/srpt/Kconfig | 2 +- drivers/net/can/dev.c | 2 +- drivers/net/phy/marvell.c | 9 +++++ drivers/s390/net/smsgiucv.c | 2 +- drivers/scsi/isci/port_config.c | 3 +- drivers/scsi/scsi_transport_iscsi.c | 29 ++++++++------ drivers/scsi/vmw_pvscsi.c | 2 +- drivers/usb/musb/musb_host.c | 5 ++- drivers/usb/musb/musb_host.h | 7 +++- drivers/usb/musb/musb_virthub.c | 25 +++++++----- fs/isofs/inode.c | 3 ++ fs/notify/fsnotify.c | 25 ++++++------ kernel/kthread.c | 7 ++-- net/key/af_key.c | 45 +++++++++++++++++----- net/mac80211/mlme.c | 25 ++++++++---- net/rds/ib_cm.c | 3 +- tools/net/bpf_dbg.c | 7 +++- .../inter-event/trigger-multi-actions-accept.tc | 44 +++++++++++++++++++++ 40 files changed, 256 insertions(+), 120 deletions(-) create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-multi-actions-accept.tc -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAlsWCuoACgkQ3qZv95d3 LNxGJA/8CLGtvjnzyjwN0qwZCECzA0dYJPBw3cquL9bPs+c5CNLfMX814J6ESs2s Mpxlysq+oRampyIlG29NZdl4s3JldL5y6m/XIJFfI7oMZXGoeV0vTOHeTXNbzdBZ m4n1fh7sxdv+9mNgf14UKEjNd5LNkkF+nfTBMqxbYGJb7VTcHF5BEwt2yMPZLhBn +P6pnvDq07i0c0dFqZaZkYrLDF6J0482ALKlUMJszr6mqarT7oqzP0yVj7DGJkPz /YxikQb6uC7ZmdCe8sM5AfYvh7MIxKu63pKqO2q1jE7ZydGhJHJ1fGYS6L+vONwT 6IqPvStPeM/oN2/GIIhWmoeOqg8w2RsfWa+oLLqNvCUgfCAm49HBsss9UN13PDOi medDlOI64CQy+uhJIBe74PoCHDtTiOsBmdi8Jn2IlsM5JQaaJ/eBZ7NtHJCUTQa5 OcLDryxPtw0/LSNEfvcmsQfj88kfSAmTea1q/gutqxzdQIMnOzCEi1Y2Mx4s/Wqi iQwn/7hnN8D90fTeeTfLzW2U4Te0T2reCbdfL1/0Tc+Sr1JzzzjxKSqIxBaVo8+Y sRXI2N20Cm5h0pMFHN3Tk167TIMiN+FobOogBYpU1WypsKDunVkAtjVMB7AI4qye 4mhefsiGvXhS7zGIFcjKrO07LdDEf5hKxgHTWWYklOu07N55WPU= =RHmJ -----END PGP SIGNATURE-----

7 years, 1 month

2
9
0 0

[PATCH] ARC: Remove CONFIG_INITRAMFS_SOURCE from defconfigs

by Alexey Brodkin

We used to have pre-set CONFIG_INITRAMFS_SOURCE with local path to intramfs in ARC defconfigs. This was quite convenient for in-house development but not that convenient for newcomers who obviusly don't have folders like "arc_initramfs" next to the Linux source tree. Which leads to quite surprising failure of defconfig building: ------------------------------->8----------------------------- ../scripts/gen_initramfs_list.sh: Cannot open '../../arc_initramfs_hs/' ../usr/Makefile:57: recipe for target 'usr/initramfs_data.cpio.gz' failed make[2]: *** [usr/initramfs_data.cpio.gz] Error 1 ------------------------------->8----------------------------- So now when more and more people start to deal with our defconfigs let's make their life easier with removal of CONFIG_INITRAMFS_SOURCE. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Kevin Hilman <khilman(a)baylibre.com> Cc: stable(a)vger.kernel.org Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- arch/arc/configs/axs101_defconfig | 1 - arch/arc/configs/axs103_defconfig | 1 - arch/arc/configs/axs103_smp_defconfig | 1 - arch/arc/configs/haps_hs_defconfig | 1 - arch/arc/configs/haps_hs_smp_defconfig | 1 - arch/arc/configs/hsdk_defconfig | 1 - arch/arc/configs/nsim_700_defconfig | 1 - arch/arc/configs/nsim_hs_defconfig | 1 - arch/arc/configs/nsim_hs_smp_defconfig | 1 - arch/arc/configs/nsimosci_defconfig | 1 - arch/arc/configs/nsimosci_hs_defconfig | 1 - arch/arc/configs/nsimosci_hs_smp_defconfig | 1 - 12 files changed, 12 deletions(-) diff --git a/arch/arc/configs/axs101_defconfig b/arch/arc/configs/axs101_defconfig index 09f85154c5a4..a635ea972304 100644 --- a/arch/arc/configs/axs101_defconfig +++ b/arch/arc/configs/axs101_defconfig @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_VM_EVENT_COUNTERS is not set diff --git a/arch/arc/configs/axs103_defconfig b/arch/arc/configs/axs103_defconfig index 09fed3ef22b6..aa507e423075 100644 --- a/arch/arc/configs/axs103_defconfig +++ b/arch/arc/configs/axs103_defconfig @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_VM_EVENT_COUNTERS is not set diff --git a/arch/arc/configs/axs103_smp_defconfig b/arch/arc/configs/axs103_smp_defconfig index ea2f6d817d1a..eba07f468654 100644 --- a/arch/arc/configs/axs103_smp_defconfig +++ b/arch/arc/configs/axs103_smp_defconfig @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_VM_EVENT_COUNTERS is not set diff --git a/arch/arc/configs/haps_hs_defconfig b/arch/arc/configs/haps_hs_defconfig index ab231c040efe..098b19fbaa51 100644 --- a/arch/arc/configs/haps_hs_defconfig +++ b/arch/arc/configs/haps_hs_defconfig @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" CONFIG_EXPERT=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set diff --git a/arch/arc/configs/haps_hs_smp_defconfig b/arch/arc/configs/haps_hs_smp_defconfig index cf449cbf440d..0104c404d897 100644 --- a/arch/arc/configs/haps_hs_smp_defconfig +++ b/arch/arc/configs/haps_hs_smp_defconfig @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_VM_EVENT_COUNTERS is not set diff --git a/arch/arc/configs/hsdk_defconfig b/arch/arc/configs/hsdk_defconfig index 1b54c72f4296..6491be0ddbc9 100644 --- a/arch/arc/configs/hsdk_defconfig +++ b/arch/arc/configs/hsdk_defconfig @@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y # CONFIG_VM_EVENT_COUNTERS is not set diff --git a/arch/arc/configs/nsim_700_defconfig b/arch/arc/configs/nsim_700_defconfig index 31c2c70b34a1..99e05cf63fca 100644 --- a/arch/arc/configs/nsim_700_defconfig +++ b/arch/arc/configs/nsim_700_defconfig @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y diff --git a/arch/arc/configs/nsim_hs_defconfig b/arch/arc/configs/nsim_hs_defconfig index a578c721d50f..0dc4f9b737e7 100644 --- a/arch/arc/configs/nsim_hs_defconfig +++ b/arch/arc/configs/nsim_hs_defconfig @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../../arc_initramfs_hs/" CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y diff --git a/arch/arc/configs/nsim_hs_smp_defconfig b/arch/arc/configs/nsim_hs_smp_defconfig index 37d7395f3272..be3c30a15e54 100644 --- a/arch/arc/configs/nsim_hs_smp_defconfig +++ b/arch/arc/configs/nsim_hs_smp_defconfig @@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig index 1e1470e2a7f0..3a74b9b21772 100644 --- a/arch/arc/configs/nsimosci_defconfig +++ b/arch/arc/configs/nsimosci_defconfig @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../arc_initramfs/" CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y diff --git a/arch/arc/configs/nsimosci_hs_defconfig b/arch/arc/configs/nsimosci_hs_defconfig index 084a6e42685b..ea2834b4dc1d 100644 --- a/arch/arc/configs/nsimosci_hs_defconfig +++ b/arch/arc/configs/nsimosci_hs_defconfig @@ -11,7 +11,6 @@ CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y CONFIG_PERF_EVENTS=y diff --git a/arch/arc/configs/nsimosci_hs_smp_defconfig b/arch/arc/configs/nsimosci_hs_smp_defconfig index f36d47990415..80a5a1b4924b 100644 --- a/arch/arc/configs/nsimosci_hs_smp_defconfig +++ b/arch/arc/configs/nsimosci_hs_smp_defconfig @@ -9,7 +9,6 @@ CONFIG_IKCONFIG_PROC=y # CONFIG_UTS_NS is not set # CONFIG_PID_NS is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="../arc_initramfs_hs/" CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set CONFIG_KPROBES=y -- 2.16.2

7 years, 1 month

2
1
0 0

[PATCH v13 1/3] ioremap: Update pgtable free interfaces with addr

by Chintan Pandya

From: Chintan Pandya <cpandya(a)codeaurora.org> The following kernel panic was observed on ARM64 platform due to a stale TLB entry. 1. ioremap with 4K size, a valid pte page table is set. 2. iounmap it, its pte entry is set to 0. 3. ioremap the same address with 2M size, update its pmd entry with a new value. 4. CPU may hit an exception because the old pmd entry is still in TLB, which leads to a kernel panic. Commit b6bdb7517c3d ("mm/vmalloc: add interfaces to free unmapped page table") has addressed this panic by falling to pte mappings in the above case on ARM64. To support pmd mappings in all cases, TLB purge needs to be performed in this case on ARM64. Add a new arg, 'addr', to pud_free_pmd_page() and pmd_free_pte_page() so that TLB purge can be added later in seprate patches. [toshi(a)hpe.com: merge changes, rewrite patch description] Fixes: 28ee90fe6048 ("x86/mm: implement free pmd/pte page interfaces") Signed-off-by: Chintan Pandya <cpandya(a)codeaurora.org> Signed-off-by: Toshi Kani <toshi.kani(a)hpe.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: "H. Peter Anvin" <hpa(a)zytor.com> Cc: Will Deacon <will.deacon(a)arm.com> Cc: Joerg Roedel <joro(a)8bytes.org> Cc: <stable(a)vger.kernel.org> --- arch/arm64/mm/mmu.c | 4 ++-- arch/x86/mm/pgtable.c | 8 +++++--- include/asm-generic/pgtable.h | 8 ++++---- lib/ioremap.c | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 493ff75..8ae5d7a 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -977,12 +977,12 @@ int pmd_clear_huge(pmd_t *pmdp) return 1; } -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return pud_none(*pud); } -int pmd_free_pte_page(pmd_t *pmd) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { return pmd_none(*pmd); } diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index ffc8c13..37e3cba 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -718,11 +718,12 @@ int pmd_clear_huge(pmd_t *pmd) /** * pud_free_pmd_page - Clear pud entry and free pmd page. * @pud: Pointer to a PUD. + * @addr: Virtual address associated with pud. * * Context: The pud range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { pmd_t *pmd; int i; @@ -733,7 +734,7 @@ int pud_free_pmd_page(pud_t *pud) pmd = (pmd_t *)pud_page_vaddr(*pud); for (i = 0; i < PTRS_PER_PMD; i++) - if (!pmd_free_pte_page(&pmd[i])) + if (!pmd_free_pte_page(&pmd[i], addr + (i * PMD_SIZE))) return 0; pud_clear(pud); @@ -745,11 +746,12 @@ int pud_free_pmd_page(pud_t *pud) /** * pmd_free_pte_page - Clear pmd entry and free pte page. * @pmd: Pointer to a PMD. + * @addr: Virtual address associated with pmd. * * Context: The pmd range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pmd_free_pte_page(pmd_t *pmd) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { pte_t *pte; diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index f59639a..b081794 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1019,8 +1019,8 @@ static inline int p4d_clear_huge(p4d_t *p4d) int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot); int pud_clear_huge(pud_t *pud); int pmd_clear_huge(pmd_t *pmd); -int pud_free_pmd_page(pud_t *pud); -int pmd_free_pte_page(pmd_t *pmd); +int pud_free_pmd_page(pud_t *pud, unsigned long addr); +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr); #else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot) { @@ -1046,11 +1046,11 @@ static inline int pmd_clear_huge(pmd_t *pmd) { return 0; } -static inline int pud_free_pmd_page(pud_t *pud) +static inline int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return 0; } -static inline int pmd_free_pte_page(pmd_t *pmd) +static inline int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { return 0; } diff --git a/lib/ioremap.c b/lib/ioremap.c index 54e5bba..517f585 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -92,7 +92,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, if (ioremap_pmd_enabled() && ((next - addr) == PMD_SIZE) && IS_ALIGNED(phys_addr + addr, PMD_SIZE) && - pmd_free_pte_page(pmd)) { + pmd_free_pte_page(pmd, addr)) { if (pmd_set_huge(pmd, phys_addr + addr, prot)) continue; } @@ -119,7 +119,7 @@ static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, if (ioremap_pud_enabled() && ((next - addr) == PUD_SIZE) && IS_ALIGNED(phys_addr + addr, PUD_SIZE) && - pud_free_pmd_page(pud)) { + pud_free_pmd_page(pud, addr)) { if (pud_set_huge(pud, phys_addr + addr, prot)) continue; } -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project

7 years, 1 month

2
1
0 0

[PATCH 1/9] dm-integrity: change the variable suspending from bool to int

by Mikulas Patocka

The early alpha processors can't write a byte or short atomically - they read 8 bytes, modify the byte or two bytes in registers and write back 8 bytes. The modification of the variable "suspending" may race with modification of the variable "failed". This patch changes suspending to an int. Signed-off-by: Mikulas Patocka <mpatocka(a)redhat.com> Cc: stable(a)vger.kernel.org --- drivers/md/dm-integrity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6/drivers/md/dm-integrity.c =================================================================== --- linux-2.6.orig/drivers/md/dm-integrity.c 2018-05-01 00:23:32.000000000 +0200 +++ linux-2.6/drivers/md/dm-integrity.c 2018-05-01 00:38:57.000000000 +0200 @@ -178,7 +178,7 @@ struct dm_integrity_c { __u8 sectors_per_block; unsigned char mode; - bool suspending; + int suspending; int failed; @@ -2210,7 +2210,7 @@ static void dm_integrity_postsuspend(str del_timer_sync(&ic->autocommit_timer); - ic->suspending = true; + WRITE_ONCE(ic->suspending, 1); queue_work(ic->commit_wq, &ic->commit_work); drain_workqueue(ic->commit_wq); @@ -2220,7 +2220,7 @@ static void dm_integrity_postsuspend(str dm_integrity_flush_buffers(ic); } - ic->suspending = false; + WRITE_ONCE(ic->suspending, 0); BUG_ON(!RB_EMPTY_ROOT(&ic->in_progress));

7 years, 1 month

1
0
0 0

netfilter: nf_flow_table: attach dst to skbs

by Jason A. Donenfeld

Some drivers, such as vxlan and wireguard, use the skb's dst in order to determine things like PMTU. They therefore loose functionality when flow offloading is enabled. So, we ensure the skb has it before xmit'ing it in the offloading path. Signed-off-by: Jason A. Donenfeld <Jason(a)zx2c4.com> Cc: stable(a)vger.kernel.org --- net/netfilter/nf_flow_table_ip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c index 82451b7..15ed913 100644 --- a/net/netfilter/nf_flow_table_ip.c +++ b/net/netfilter/nf_flow_table_ip.c @@ -220,7 +220,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, enum flow_offload_tuple_dir dir; struct flow_offload *flow; struct net_device *outdev; - const struct rtable *rt; + struct rtable *rt; unsigned int thoff; struct iphdr *iph; __be32 nexthop; @@ -241,7 +241,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, dir = tuplehash->tuple.dir; flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]); - rt = (const struct rtable *)flow->tuplehash[dir].tuple.dst_cache; + rt = (struct rtable *)flow->tuplehash[dir].tuple.dst_cache; if (unlikely(nf_flow_exceeds_mtu(skb, flow->tuplehash[dir].tuple.mtu)) && (ip_hdr(skb)->frag_off & htons(IP_DF)) != 0) @@ -264,6 +264,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, skb->dev = outdev; nexthop = rt_nexthop(rt, flow->tuplehash[!dir].tuple.src_v4.s_addr); + skb_dst_set_noref(skb, &rt->dst); neigh_xmit(NEIGH_ARP_TABLE, outdev, &nexthop, skb); return NF_STOLEN; @@ -480,6 +481,7 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, skb->dev = outdev; nexthop = rt6_nexthop(rt, &flow->tuplehash[!dir].tuple.src_v6); + skb_dst_set_noref(skb, &rt->dst); neigh_xmit(NEIGH_ND_TABLE, outdev, nexthop, skb); return NF_STOLEN;

7 years, 1 month

3
7
0 0

[PATCH 4.9 00/61] 4.9.107-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.107 release. There are 61 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 Thu Jun 7 17:00:59 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.107-rc… 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.107-rc1 Aleksey Makarov <aleksey.makarov(a)linaro.org> serial: pl011: add console matching function David S. Miller <davem(a)davemloft.net> sparc64: Don't clibber fixed registers in __multi4. Hugh Dickins <hughd(a)google.com> mm: fix the NULL mapping case in __isolate_lru_page() Al Viro <viro(a)zeniv.linux.org.uk> fix io_destroy()/aio_complete() race David S. Miller <davem(a)davemloft.net> sparc64: Fix build warnings with gcc 7. Ondrej Zary <linux(a)rainbow-software.org> drm/i915: Disable LVDS on Radiant P845 Dhinakaran Pandiyan <dhinakaran.pandiyan(a)intel.com> drm/psr: Fix missed entry in PSR setup time table. Parav Pandit <parav(a)mellanox.com> IB/core: Fix error code for invalid GID entry Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> hwtracing: stm: fix build error on some arches Alexander Shishkin <alexander.shishkin(a)linux.intel.com> stm class: Use vmalloc for the master map Bart Van Assche <bart.vanassche(a)wdc.com> scsi: scsi_transport_srp: Fix shost to rport translation Maciej W. Rozycki <macro(a)mips.com> MIPS: prctl: Disallow FRE without FR with PR_SET_FP_MODE requests Maciej W. Rozycki <macro(a)mips.com> MIPS: ptrace: Fix PTRACE_PEEKUSR requests for 64-bit FGRs Martin Kelly <mkelly(a)xevo.com> iio:kfifo_buf: check for uint overflow Sarah Newman <srn(a)prgmr.com> net/mlx4_en: fix potential use-after-free with dma_unmap_page Nicholas Piggin <npiggin(a)gmail.com> powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit Michael Ellerman <mpe(a)ellerman.id.au> powerpc/64s: Fix section mismatch warnings from setup_rfi_flush() Mauricio Faria de Oliveira <mauricfo(a)linux.vnet.ibm.com> powerpc/pseries: Restore default security feature flags on setup Mauricio Faria de Oliveira <mauricfo(a)linux.vnet.ibm.com> powerpc: Move default security feature flags Mauricio Faria de Oliveira <mauricfo(a)linux.vnet.ibm.com> powerpc/pseries: Fix clearing of security feature flags Michael Ellerman <mpe(a)ellerman.id.au> powerpc/64s: Wire up cpu_show_spectre_v2() Michael Ellerman <mpe(a)ellerman.id.au> powerpc/64s: Wire up cpu_show_spectre_v1() Michael Ellerman <mpe(a)ellerman.id.au> powerpc/pseries: Use the security flags in pseries_setup_rfi_flush() Michael Ellerman <mpe(a)ellerman.id.au> powerpc/powernv: Use the security flags in pnv_setup_rfi_flush() Michael Ellerman <mpe(a)ellerman.id.au> powerpc/64s: Enhance the information in cpu_show_meltdown() Michael Ellerman <mpe(a)ellerman.id.au> powerpc/64s: Move cpu_show_meltdown() Michael Ellerman <mpe(a)ellerman.id.au> powerpc/powernv: Set or clear security feature flags Michael Ellerman <mpe(a)ellerman.id.au> powerpc/pseries: Set or clear security feature flags Michael Ellerman <mpe(a)ellerman.id.au> powerpc: Add security feature flags for Spectre/Meltdown Michael Ellerman <mpe(a)ellerman.id.au> powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags Michael Ellerman <mpe(a)ellerman.id.au> powerpc/rfi-flush: Call setup_rfi_flush() after LPM migration Mauricio Faria de Oliveira <mauricfo(a)linux.vnet.ibm.com> powerpc/rfi-flush: Differentiate enabled and patched flush types Michael Ellerman <mpe(a)ellerman.id.au> powerpc/rfi-flush: Always enable fallback flush on pseries Michael Ellerman <mpe(a)ellerman.id.au> powerpc/rfi-flush: Make it possible to call setup_rfi_flush() again Michael Ellerman <mpe(a)ellerman.id.au> powerpc/rfi-flush: Move the logic to avoid a redo into the debugfs code Michael Ellerman <mpe(a)ellerman.id.au> powerpc/powernv: Support firmware disable of RFI flush Michael Ellerman <mpe(a)ellerman.id.au> powerpc/pseries: Support firmware disable of RFI flush Michael Ellerman <mpe(a)ellerman.id.au> powerpc/rfi-flush: Move out of HARDLOCKUP_DETECTOR #ifdef Mark Rutland <mark.rutland(a)arm.com> arm64/cpufeature: don't use mutex in bringup path Suzuki K Poulose <suzuki.poulose(a)arm.com> arm64: Add hypervisor safe helper for checking constant capabilities Potomski, MichalX <michalx.potomski(a)intel.com> scsi: ufs: Factor out ufshcd_read_desc_param Tomas Winkler <tomas.winkler(a)intel.com> scsi: ufs: refactor device descriptor reading Subhash Jadavani <subhashj(a)codeaurora.org> scsi: ufs: fix failure to read the string descriptor Eric Dumazet <edumazet(a)google.com> tcp: avoid integer overflows in tcp_rcv_space_adjust() Juergen Gross <jgross(a)suse.com> x86/amd: don't set X86_BUG_SYSRET_SS_ATTRS when running under Xen Juergen Gross <jgross(a)suse.com> xen: set cpu capabilities from xen_start_kernel() Juergen Gross <jgross(a)suse.com> x86/amd: revert commit 944e0fc51a89c9827b9 Colin Ian King <colin.king(a)canonical.com> platform/chrome: cros_ec_lpc: remove redundant pointer request Colin Ian King <colin.king(a)canonical.com> ASoC: Intel: sst: remove redundant variable dma_dev_name Matthias Kaehlcke <mka(a)chromium.org> rtlwifi: rtl8192cu: Remove variable self-assignment in rf.c Colin Ian King <colin.king(a)canonical.com> dma-buf: remove redundant initialization of sg_table Eric Biggers <ebiggers(a)google.com> cfg80211: further limit wiphy names to 64 bytes Sachin Grover <sgrover(a)codeaurora.org> selinux: KASAN: slab-out-of-bounds in xattr_getsecurity Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracing: Fix crash when freeing instances with event triggers Benjamin Tissoires <benjamin.tissoires(a)redhat.com> Input: elan_i2c_smbus - fix corrupted stack Mimi Zohar <zohar(a)linux.vnet.ibm.com> Revert "ima: limit file hash setting by user to fix and log modes" Brian Foster <bfoster(a)redhat.com> xfs: detect agfl count corruption and reset agfl Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "pinctrl: msm: Use dynamic GPIO numbering" Geert Uytterhoeven <geert(a)linux-m68k.org> USB: serial: cp210x: use tcflag_t to fix incompatible pointer type Michael Neuling <mikey(a)neuling.org> powerpc/64s: Clear PCR on boot Will Deacon <will.deacon(a)arm.com> arm64: lse: Add early clobbers to some input/output asm operands ------------- Diffstat: Makefile | 4 +- arch/arm64/include/asm/atomic_lse.h | 22 +- arch/arm64/include/asm/cpufeature.h | 27 +- arch/arm64/include/asm/kvm_host.h | 10 +- arch/arm64/include/asm/kvm_mmu.h | 2 +- arch/arm64/include/asm/mmu.h | 2 +- arch/arm64/kernel/cpufeature.c | 28 ++- arch/arm64/kernel/process.c | 2 +- arch/mips/kernel/process.c | 4 + arch/mips/kernel/ptrace.c | 2 +- arch/mips/kernel/ptrace32.c | 2 +- arch/powerpc/include/asm/exception-64s.h | 29 +++ arch/powerpc/include/asm/feature-fixups.h | 19 ++ arch/powerpc/include/asm/hvcall.h | 3 + arch/powerpc/include/asm/security_features.h | 85 +++++++ arch/powerpc/include/asm/setup.h | 2 +- arch/powerpc/kernel/Makefile | 2 +- arch/powerpc/kernel/cpu_setup_power.S | 6 + arch/powerpc/kernel/exceptions-64s.S | 16 +- arch/powerpc/kernel/security.c | 237 ++++++++++++++++++ arch/powerpc/kernel/setup_64.c | 37 ++- arch/powerpc/kernel/vmlinux.lds.S | 14 ++ arch/powerpc/lib/feature-fixups.c | 124 +++++++++- arch/powerpc/platforms/powernv/setup.c | 92 +++++-- arch/powerpc/platforms/pseries/mobility.c | 3 + arch/powerpc/platforms/pseries/pseries.h | 2 + arch/powerpc/platforms/pseries/setup.c | 81 ++++-- arch/sparc/kernel/ds.c | 2 +- arch/sparc/lib/multi3.S | 24 +- arch/x86/xen/enlighten.c | 14 +- drivers/dma-buf/dma-buf.c | 2 +- drivers/gpu/drm/drm_dp_helper.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 8 + drivers/hwtracing/stm/core.c | 7 +- drivers/iio/buffer/kfifo_buf.c | 7 + drivers/infiniband/core/cache.c | 2 +- drivers/input/mouse/elan_i2c_smbus.c | 22 +- drivers/irqchip/irq-gic-v3.c | 13 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 32 ++- .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 3 - drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- drivers/platform/chrome/cros_ec_lpc.c | 3 - drivers/scsi/scsi_transport_srp.c | 22 +- drivers/scsi/ufs/ufs.h | 34 +-- drivers/scsi/ufs/ufs_quirks.h | 28 +-- drivers/scsi/ufs/ufshcd.c | 272 +++++++++++++++------ drivers/scsi/ufs/ufshcd.h | 16 ++ drivers/tty/serial/amba-pl011.c | 55 +++++ drivers/usb/serial/cp210x.c | 8 +- fs/aio.c | 3 +- fs/xfs/libxfs/xfs_alloc.c | 94 +++++++ fs/xfs/xfs_mount.h | 1 + fs/xfs/xfs_trace.h | 9 +- include/linux/tcp.h | 2 +- include/uapi/linux/nl80211.h | 2 +- kernel/trace/trace_events_trigger.c | 5 +- mm/vmscan.c | 2 +- net/ipv4/tcp_input.c | 10 +- security/integrity/ima/ima_appraise.c | 8 +- security/selinux/ss/services.c | 2 +- sound/soc/intel/common/sst-firmware.c | 2 - 61 files changed, 1277 insertions(+), 297 deletions(-)

7 years, 1 month

4
62
0 0

[PATCH resend] drivers: dma-buf: Change %p to %pK in debug messages

by Daniel Rosenberg

The format specifier %p can leak kernel addresses while not valuing the kptr_restrict system settings. Use %pK instead of %p, which also evaluates whether kptr_restrict is set. Signed-off-by: Divya Ponnusamy <pdivya(a)codeaurora.org> Signed-off-by: Daniel Rosenberg <drosen(a)google.com> Cc: stable <stable(a)vger.kernel.org> --- drivers/dma-buf/sync_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c index c4c8ecb24aa9..d8d340542a79 100644 --- a/drivers/dma-buf/sync_debug.c +++ b/drivers/dma-buf/sync_debug.c @@ -133,7 +133,7 @@ static void sync_print_sync_file(struct seq_file *s, char buf[128]; int i; - seq_printf(s, "[%p] %s: %s\n", sync_file, + seq_printf(s, "[%pK] %s: %s\n", sync_file, sync_file_get_name(sync_file, buf, sizeof(buf)), sync_status_str(dma_fence_get_status(sync_file->fence))); -- 2.17.0.441.gb46fe60e1d-goog

7 years, 1 month

3
2
0 0

Re: [patch 3/8] x86/apic: Provide apic_ack_irq()

by Dou Liyang

Hi Thomas, At 06/04/2018 11:33 PM, Thomas Gleixner wrote: > apic_ack_edge() is explicitely for handling interrupt affinity cleanup when > interrupt remapping is not available or disable. > > Remapped interrupts and also some of the platform specific special > interrupts, e.g. UV, invoke ack_APIC_irq() directly. > > To address the issue of failing an affinity update with -EBUSY the delayed > affinity mechanism can be reused, but ack_APIC_irq() does not handle > that. Adding this to ack_APIC_irq() is not possible, because that function > is also used for exceptions and directly handled interrupts like IPIs. > > Create a new function, which just contains the conditional invocation of > irq_move_irq() and the final ack_APIC_irq(). Making the invocation of > irq_move_irq() conditional avoids the out of line call if the pending bit > is not set. > > Reuse the new function in apic_ack_edge(). > > Preparatory change for the real fix > > Fixes: dccfe3147b42 ("x86/vector: Simplify vector move cleanup") > Signed-off-by: Thomas Gleixner<tglx(a)linutronix.de> > Cc:stable@vger.kernel.org > --- > arch/x86/include/asm/apic.h | 2 ++ > arch/x86/kernel/apic/vector.c | 10 ++++++++-- > 2 files changed, 10 insertions(+), 2 deletions(-) > > --- a/arch/x86/include/asm/apic.h > +++ b/arch/x86/include/asm/apic.h > @@ -436,6 +436,8 @@ static inline void apic_set_eoi_write(vo > > #endif /* CONFIG_X86_LOCAL_APIC */ > > +extern void apic_ack_irq(struct irq_data *data); > + > static inline void ack_APIC_irq(void) > { > /* > --- a/arch/x86/kernel/apic/vector.c > +++ b/arch/x86/kernel/apic/vector.c > @@ -809,11 +809,17 @@ static int apic_retrigger_irq(struct irq > return 1; > } > > +void apic_ack_irq(struct irq_data *irqd) > +{ > + if (unlikely(irqd_is_setaffinity_pending(irqd))) Affinity pending is also judged in > + irq_move_irq(irqd); If we can remove the if(...) statement here Thanks, dou > + ack_APIC_irq(); > +} > + > void apic_ack_edge(struct irq_data *irqd) > { > irq_complete_move(irqd_cfg(irqd)); > - irq_move_irq(irqd); > - ack_APIC_irq(); > + apic_ack_irq(irqd); > } > > static struct irq_chip lapic_controller = {

7 years, 1 month

2
4
0 0

[PATCH v2 1/2] pwm: lpss: platform: Save/restore the ctrl register over a suspend/resume

by Hans de Goede

On some devices the contents of the ctrl register get lost over a suspend/resume and the PWM comes back up disabled after the resume. This is seen on some Bay Trail devices with the PWM in ACPI enumerated mode, so it shows up as a platform device instead of a PCI device. If we still think it is enabled and then try to change the duty-cycle after this, we end up with a "PWM_SW_UPDATE was not cleared" error and the PWM is stuck in that state from then on. This commit adds suspend and resume pm callbacks to the pwm-lpss-platform code, which save/restore the ctrl register over a suspend/resume, fixing this. Note that: 1) There is no need to do this over a runtime suspend, since we only runtime suspend when disabled and then we properly set the enable bit and reprogram the timings when we re-enable the PWM. 2) This may be happening on more systems then we realize, but has been covered up sofar by a bug in the acpi-lpss.c code which was save/restoring the regular device registers instead of the lpss private registers due to lpss_device_desc.prv_offset not being set. This is fixed by a later patch in this series. Cc: stable(a)vger.kernel.org Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- Changes in v2: -Add Cc: stable(a)vger.kernel.org to make sure this goes into stable together with "ACPI / LPSS: Add missing prv_offset setting for byt/cht PWM devices" which depends on this --- drivers/pwm/pwm-lpss-platform.c | 5 +++++ drivers/pwm/pwm-lpss.c | 30 ++++++++++++++++++++++++++++++ drivers/pwm/pwm-lpss.h | 2 ++ 3 files changed, 37 insertions(+) diff --git a/drivers/pwm/pwm-lpss-platform.c b/drivers/pwm/pwm-lpss-platform.c index 5d6ed1507d29..5561b9e190f8 100644 --- a/drivers/pwm/pwm-lpss-platform.c +++ b/drivers/pwm/pwm-lpss-platform.c @@ -74,6 +74,10 @@ static int pwm_lpss_remove_platform(struct platform_device *pdev) return pwm_lpss_remove(lpwm); } +static SIMPLE_DEV_PM_OPS(pwm_lpss_platform_pm_ops, + pwm_lpss_suspend, + pwm_lpss_resume); + static const struct acpi_device_id pwm_lpss_acpi_match[] = { { "80860F09", (unsigned long)&pwm_lpss_byt_info }, { "80862288", (unsigned long)&pwm_lpss_bsw_info }, @@ -86,6 +90,7 @@ static struct platform_driver pwm_lpss_driver_platform = { .driver = { .name = "pwm-lpss", .acpi_match_table = pwm_lpss_acpi_match, + .pm = &pwm_lpss_platform_pm_ops, }, .probe = pwm_lpss_probe_platform, .remove = pwm_lpss_remove_platform, diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c index 8db0d40ccacd..4721a264bac2 100644 --- a/drivers/pwm/pwm-lpss.c +++ b/drivers/pwm/pwm-lpss.c @@ -32,10 +32,13 @@ /* Size of each PWM register space if multiple */ #define PWM_SIZE 0x400 +#define MAX_PWMS 4 + struct pwm_lpss_chip { struct pwm_chip chip; void __iomem *regs; const struct pwm_lpss_boardinfo *info; + u32 saved_ctrl[MAX_PWMS]; }; static inline struct pwm_lpss_chip *to_lpwm(struct pwm_chip *chip) @@ -177,6 +180,9 @@ struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, unsigned long c; int ret; + if (WARN_ON(info->npwm > MAX_PWMS)) + return ERR_PTR(-ENODEV); + lpwm = devm_kzalloc(dev, sizeof(*lpwm), GFP_KERNEL); if (!lpwm) return ERR_PTR(-ENOMEM); @@ -212,6 +218,30 @@ int pwm_lpss_remove(struct pwm_lpss_chip *lpwm) } EXPORT_SYMBOL_GPL(pwm_lpss_remove); +int pwm_lpss_suspend(struct device *dev) +{ + struct pwm_lpss_chip *lpwm = dev_get_drvdata(dev); + int i; + + for (i = 0; i < lpwm->info->npwm; i++) + lpwm->saved_ctrl[i] = readl(lpwm->regs + i * PWM_SIZE + PWM); + + return 0; +} +EXPORT_SYMBOL_GPL(pwm_lpss_suspend); + +int pwm_lpss_resume(struct device *dev) +{ + struct pwm_lpss_chip *lpwm = dev_get_drvdata(dev); + int i; + + for (i = 0; i < lpwm->info->npwm; i++) + writel(lpwm->saved_ctrl[i], lpwm->regs + i * PWM_SIZE + PWM); + + return 0; +} +EXPORT_SYMBOL_GPL(pwm_lpss_resume); + MODULE_DESCRIPTION("PWM driver for Intel LPSS"); MODULE_AUTHOR("Mika Westerberg <mika.westerberg(a)linux.intel.com>"); MODULE_LICENSE("GPL v2"); diff --git a/drivers/pwm/pwm-lpss.h b/drivers/pwm/pwm-lpss.h index 98306bb02cfe..7a4238ad1fcb 100644 --- a/drivers/pwm/pwm-lpss.h +++ b/drivers/pwm/pwm-lpss.h @@ -28,5 +28,7 @@ struct pwm_lpss_boardinfo { struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, const struct pwm_lpss_boardinfo *info); int pwm_lpss_remove(struct pwm_lpss_chip *lpwm); +int pwm_lpss_suspend(struct device *dev); +int pwm_lpss_resume(struct device *dev); #endif /* __PWM_LPSS_H */ -- 2.17.0

7 years, 1 month

5
8
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror