April 2021 - Linux-stable-mirror

[PATCH] nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path

by Prike Liang

The NVME device pluged in some AMD PCIE root port will resume timeout from s2idle which caused by NVME power CFG lost in the SMU FW restore. This issue can be workaround by using PCIe power set with simple suspend/resume process path instead of APST. In the onwards ASIC will try do the NVME shutdown save and restore in the BIOS and still need PCIe power setting to resume from RTD3 for s2idle. Signed-off-by: Prike Liang <Prike.Liang(a)amd.com> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> Cc: <stable(a)vger.kernel.org> # 5.11+ --- drivers/nvme/host/pci.c | 5 +++++ drivers/pci/quirks.c | 10 ++++++++++ include/linux/pci.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 6bad4d4..dd46d9e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2832,6 +2832,7 @@ static bool nvme_acpi_storage_d3(struct pci_dev *dev) { struct acpi_device *adev; struct pci_dev *root; + struct pci_dev *rdev; acpi_handle handle; acpi_status status; u8 val; @@ -2845,6 +2846,10 @@ static bool nvme_acpi_storage_d3(struct pci_dev *dev) if (!root) return false; + rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0)); + if (rdev->dev_flags & PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND) + return NVME_QUIRK_SIMPLE_SUSPEND; + adev = ACPI_COMPANION(&root->dev); if (!adev) return false; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 653660e3..f95c8b2 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -312,6 +312,16 @@ static void quirk_nopciamd(struct pci_dev *dev) } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8151_0, quirk_nopciamd); +static void quirk_amd_nvme_fixup(struct pci_dev *dev) +{ + struct pci_dev *rdev; + + dev->dev_flags |= PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND; + pci_info(dev, "AMD simple suspend opt enabled\n"); + +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1630, quirk_amd_nvme_fixup); + /* Triton requires workarounds to be used by the drivers */ static void quirk_triton(struct pci_dev *dev) { diff --git a/include/linux/pci.h b/include/linux/pci.h index 53f4904..a6e1b1b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -227,6 +227,8 @@ enum pci_dev_flags { PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10), /* Don't use Relaxed Ordering for TLPs directed at this device */ PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11), + /* AMD simple suspend opt quirk */ + PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND = (__force pci_dev_flags_t) (1 << 12), }; enum pci_irq_reroute_variant { -- 2.7.4

3 years, 9 months

3
2
0 0

[PATCH v3 4/9] drm/vc4: hdmi: Prevent clock unbalance

by Maxime Ripard

Since we fixed the hooks to disable the encoder at boot, we now have an unbalanced clk_disable call at boot since we never enabled them in the first place. Let's mimic the state of the hardware and enable the clocks at boot if the controller is enabled to get the use-count right. Cc: <stable(a)vger.kernel.org> # v5.10+ Fixes: 09c438139b8f ("drm/vc4: hdmi: Implement finer-grained hooks") Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> --- drivers/gpu/drm/vc4/vc4_hdmi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 1fda574579af..9c919472ae84 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1995,6 +1995,14 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) if (vc4_hdmi->variant->reset) vc4_hdmi->variant->reset(vc4_hdmi); + if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") || + of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) && + HDMI_READ(HDMI_VID_CTL) & VC4_HD_VID_CTL_ENABLE) { + clk_prepare_enable(vc4_hdmi->pixel_clock); + clk_prepare_enable(vc4_hdmi->hsm_clock); + clk_prepare_enable(vc4_hdmi->pixel_bvb_clock); + } + pm_runtime_enable(dev); drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS); -- 2.30.2

3 years, 9 months

1
0
0 0

[PATCH v3 2/9] drm/vc4: crtc: Skip the TXP

by Maxime Ripard

The vc4_set_crtc_possible_masks is meant to run over all the encoders and then set their possible_crtcs mask to their associated pixelvalve. However, since the commit 39fcb2808376 ("drm/vc4: txp: Turn the TXP into a CRTC of its own"), the TXP has been turned to a CRTC and encoder of its own, and while it does indeed register an encoder, it no longer has an associated pixelvalve. The code will thus run over the TXP encoder and set a bogus possible_crtcs mask, overriding the one set in the TXP bind function. In order to fix this, let's skip any virtual encoder. Cc: <stable(a)vger.kernel.org> # v5.9+ Fixes: 39fcb2808376 ("drm/vc4: txp: Turn the TXP into a CRTC of its own") Acked-by: Thomas Zimmermann <tzimmermann(a)suse.de> Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> --- drivers/gpu/drm/vc4/vc4_crtc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 269390bc586e..f1f2e8cbce79 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -1018,6 +1018,9 @@ static void vc4_set_crtc_possible_masks(struct drm_device *drm, struct vc4_encoder *vc4_encoder; int i; + if (encoder->encoder_type == DRM_MODE_ENCODER_VIRTUAL) + continue; + vc4_encoder = to_vc4_encoder(encoder); for (i = 0; i < ARRAY_SIZE(pv_data->encoder_types); i++) { if (vc4_encoder->type == encoder_types[i]) { -- 2.30.2

3 years, 9 months

1
0
0 0

[PATCH v3 1/9] drm/vc4: txp: Properly set the possible_crtcs mask

by Maxime Ripard

The current code does a binary OR on the possible_crtcs variable of the TXP encoder, while we want to set it to that value instead. Cc: <stable(a)vger.kernel.org> # v5.9+ Fixes: 39fcb2808376 ("drm/vc4: txp: Turn the TXP into a CRTC of its own") Acked-by: Thomas Zimmermann <tzimmermann(a)suse.de> Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> --- drivers/gpu/drm/vc4/vc4_txp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index c0122d83b651..2fc7f4b5fa09 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -507,7 +507,7 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) return ret; encoder = &txp->connector.encoder; - encoder->possible_crtcs |= drm_crtc_mask(crtc); + encoder->possible_crtcs = drm_crtc_mask(crtc); ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0, dev_name(dev), txp); -- 2.30.2

3 years, 9 months

1
0
0 0

[PATCH v2] mtd: rawnand: lpc32xx_slc: Fix external use of SW Hamming ECC helper

by Miquel Raynal

Since the Hamming software ECC engine has been updated to become a proper and independent ECC engine, it is now mandatory to either initialize the engine before using any one of his functions or use one of the bare helpers which only perform the calculations. As there is no actual need for a proper ECC initialization, let's just use the bare helper instead of the rawnand one. Fixes: 19b2ce184b9f ("mtd: nand: ecc-hamming: Stop using raw NAND structures") Cc: stable(a)vger.kernel.org Reported-by: Trevor Woerner <twoerner(a)gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- drivers/mtd/nand/raw/lpc32xx_slc.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/lpc32xx_slc.c b/drivers/mtd/nand/raw/lpc32xx_slc.c index 6b7269cfb7d8..65663f5ba54f 100644 --- a/drivers/mtd/nand/raw/lpc32xx_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_slc.c @@ -27,6 +27,7 @@ #include <linux/of.h> #include <linux/of_gpio.h> #include <linux/mtd/lpc32xx_slc.h> +#include <linux/mtd/nand-ecc-sw-hamming.h> #define LPC32XX_MODNAME "lpc32xx-nand" @@ -344,6 +345,18 @@ static int lpc32xx_nand_ecc_calculate(struct nand_chip *chip, return 0; } +/* + * Corrects the data + */ +static int lpc32xx_nand_ecc_correct(struct nand_chip *chip, + unsigned char *buf, + unsigned char *read_ecc, + unsigned char *calc_ecc) +{ + return ecc_sw_hamming_correct(buf, read_ecc, calc_ecc, + chip->ecc.size, false); +} + /* * Read a single byte from NAND device */ @@ -802,7 +815,7 @@ static int lpc32xx_nand_attach_chip(struct nand_chip *chip) chip->ecc.write_oob = lpc32xx_nand_write_oob_syndrome; chip->ecc.read_oob = lpc32xx_nand_read_oob_syndrome; chip->ecc.calculate = lpc32xx_nand_ecc_calculate; - chip->ecc.correct = rawnand_sw_hamming_correct; + chip->ecc.correct = lpc32xx_nand_ecc_correct; chip->ecc.hwctl = lpc32xx_nand_ecc_enable; /* @@ -819,8 +832,14 @@ static int lpc32xx_nand_attach_chip(struct nand_chip *chip) return 0; } +static void lpc32xx_nand_detach_chip(struct nand_chip *chip) +{ + rawnand_sw_hamming_cleanup(chip); +} + static const struct nand_controller_ops lpc32xx_nand_controller_ops = { .attach_chip = lpc32xx_nand_attach_chip, + .detach_chip = lpc32xx_nand_detach_chip, }; /* -- 2.27.0

3 years, 9 months

2
1
0 0

[PATCH 5.10 000/188] 5.10.30-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.30 release. There are 188 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 Wed, 14 Apr 2021 08:39:44 +0000. 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/v5.x/stable-review/patch-5.10.30-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.10.30-rc1 Vlad Buslov <vladbu(a)nvidia.com> Revert "net: sched: bump refcount for new action in ACT replace mode" Alexander Aring <aahringo(a)redhat.com> net: ieee802154: stop dump llsec params for monitors Alexander Aring <aahringo(a)redhat.com> net: ieee802154: forbid monitor for del llsec seclevel Alexander Aring <aahringo(a)redhat.com> net: ieee802154: forbid monitor for set llsec params Alexander Aring <aahringo(a)redhat.com> net: ieee802154: fix nl802154 del llsec devkey Alexander Aring <aahringo(a)redhat.com> net: ieee802154: fix nl802154 add llsec key Alexander Aring <aahringo(a)redhat.com> net: ieee802154: fix nl802154 del llsec dev Alexander Aring <aahringo(a)redhat.com> net: ieee802154: fix nl802154 del llsec key Alexander Aring <aahringo(a)redhat.com> net: ieee802154: nl-mac: fix check on panid Pavel Skripkin <paskripkin(a)gmail.com> net: mac802154: Fix general protection fault Pavel Skripkin <paskripkin(a)gmail.com> drivers: net: fix memory leak in peak_usb_create_dev Pavel Skripkin <paskripkin(a)gmail.com> drivers: net: fix memory leak in atusb_probe Phillip Potter <phil(a)philpotter.co.uk> net: tun: set tun->dev->addr_len during TUNSETLINK processing Du Cheng <ducheng2(a)gmail.com> cfg80211: remove WARN_ON() in cfg80211_sme_connect Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> gpiolib: Read "gpio-line-names" from a firmware node Kumar Kartikeya Dwivedi <memxor(a)gmail.com> net: sched: bump refcount for new action in ACT replace mode Rafał Miłecki <rafal(a)milecki.pl> dt-bindings: net: ethernet-controller: fix typo in NVMEM Arnd Bergmann <arnd(a)arndb.de> lockdep: Address clang -Wformat warning printing for %hd Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> clk: socfpga: fix iomem pointer cast on 64-bit William Roche <william.roche(a)oracle.com> RAS/CEC: Correct ce_add_elem()'s returned values Eli Cohen <elic(a)nvidia.com> vdpa/mlx5: Fix wrong use of bit numbers Si-Wei Liu <si-wei.liu(a)oracle.com> vdpa/mlx5: should exclude header length and fcs from mtu Leon Romanovsky <leon(a)kernel.org> RDMA/addr: Be strict with gid size Grzegorz Siwik <grzegorz.siwik(a)intel.com> i40e: Fix parameters in aq_get_phy_register() Dom Cobley <popcornmix(a)gmail.com> drm/vc4: crtc: Reduce PV fifo threshold on hvs4 Kamal Heib <kamalheib1(a)gmail.com> RDMA/qedr: Fix kernel panic when trying to access recv_cq Jin Yao <yao.jin(a)linux.intel.com> perf report: Fix wrong LBR block sorting Potnuri Bharat Teja <bharat(a)chelsio.com> RDMA/cxgb4: check for ipv6 address properly while destroying listener Aya Levin <ayal(a)nvidia.com> net/mlx5: Fix PBMC register mapping Aya Levin <ayal(a)nvidia.com> net/mlx5: Fix PPLM register mapping Raed Salem <raeds(a)nvidia.com> net/mlx5: Fix placement of log_max_flow_counter Guangbin Huang <huangguangbin2(a)huawei.com> net: hns3: clear VF down state bit before request link status Xin Long <lucien.xin(a)gmail.com> tipc: increment the tmp aead refcnt before attaching it Marc Kleine-Budde <mkl(a)pengutronix.de> can: mcp251x: fix support for half duplex SPI host controllers Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: fix 11ax disabled bit in the regulatory capability flags Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> i2c: designware: Adjust bus_freq_hz when refuse high speed mode set Ilya Maximets <i.maximets(a)ovn.org> openvswitch: fix send of uninitialized stack memory in ct limit reply Zheng Yongjun <zhengyongjun3(a)huawei.com> net: openvswitch: conntrack: simplify the return expression of ovs_ct_limit_get_default_limit() Adrian Hunter <adrian.hunter(a)intel.com> perf inject: Fix repipe usage Alexander Gordeev <agordeev(a)linux.ibm.com> s390/cpcmd: fix inline assembly register clobbering Zqiang <qiang.zhang(a)windriver.com> workqueue: Move the position of debug_work_activate() in __queue_work() Lukasz Bartosik <lb(a)semihalf.com> clk: fix invalid usage of list cursor in unregister Lukasz Bartosik <lb(a)semihalf.com> clk: fix invalid usage of list cursor in register Claudiu Beznea <claudiu.beznea(a)microchip.com> net: macb: restore cmp registers on resume path Yunjian Wang <wangyunjian(a)huawei.com> net: cls_api: Fix uninitialised struct field bo->unlocked_driver_cb Can Guo <cang(a)codeaurora.org> scsi: ufs: core: Fix wrong Task Tag used in task management request UPIUs Can Guo <cang(a)codeaurora.org> scsi: ufs: core: Fix task management request completion timeout Paolo Abeni <pabeni(a)redhat.com> mptcp: forbit mcast-related sockopt on MPTCP sockets Norman Maurer <norman_maurer(a)apple.com> net: udp: Add support for getsockopt(..., ..., UDP_GRO, ..., ...); Stephen Boyd <swboyd(a)chromium.org> drm/msm: Set drvdata to NULL when msm_drm_init() fails Md Haris Iqbal <haris.iqbal(a)cloud.ionos.com> RDMA/rtrs-clt: Close rtrs client conn before destroying rtrs clt session files Eryk Rybak <eryk.roch.rybak(a)intel.com> i40e: Fix display statistics for veb_tc Arnd Bergmann <arnd(a)arndb.de> soc/fsl: qbman: fix conflicting alignment attributes Ong Boon Leong <boon.leong.ong(a)intel.com> xdp: fix xdp_return_frame() kernel BUG throw for page_pool memory model Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> net/rds: Fix a use after free in rds_message_map_pages Daniel Jurgens <danielj(a)mellanox.com> net/mlx5: Don't request more than supported EQs Aya Levin <ayal(a)nvidia.com> net/mlx5e: Fix ethtool indication of connector type Ariel Levkovich <lariel(a)nvidia.com> net/mlx5e: Fix mapping of ct_label zero Bastian Germann <bage(a)linutronix.de> ASoC: sunxi: sun4i-codec: fill ASoC card owner 周琰杰 (Zhou Yanjie) <zhouyanjie(a)wanyeetech.com> I2C: JZ4780: Fix bug for Ingenic X1000. Florian Fainelli <f.fainelli(a)gmail.com> net: phy: broadcom: Only advertise EEE for supported modes Yinjun Zhang <yinjun.zhang(a)corigine.com> nfp: flower: ignore duplicate merge hints from FW Loic Poulain <loic.poulain(a)linaro.org> net: qrtr: Fix memory leak on qrtr_tx_wait failure Milton Miller <miltonm(a)us.ibm.com> net/ncsi: Avoid channel_monitor hrtimer deadlock Stefan Riedmueller <s.riedmueller(a)phytec.de> ARM: dts: imx6: pbab01: Set vmmc supply for both SD interfaces Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> net:tipc: Fix a double free in tipc_sk_mcast_rcv Rahul Lakkireddy <rahul.lakkireddy(a)chelsio.com> cxgb4: avoid collecting SGE_QBASE regs during traffic Maxim Kochetkov <fido_max(a)inbox.ru> net: dsa: Fix type was not set for devlink port Claudiu Manoil <claudiu.manoil(a)nxp.com> gianfar: Handle error code at MAC address change Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> ethernet: myri10ge: Fix a use after free in myri10ge_sw_tso Ido Schimmel <idosch(a)nvidia.com> mlxsw: spectrum: Fix ECN marking in tunnel decapsulation Oliver Hartkopp <socketcan(a)hartkopp.net> can: isotp: fix msg_namelen values depending on CAN_REQUIRED_SIZE Oliver Hartkopp <socketcan(a)hartkopp.net> can: bcm/raw: fix msg_namelen values depending on CAN_REQUIRED_SIZE Steffen Klassert <steffen.klassert(a)secunet.com> xfrm: Provide private skb extensions for segmented and hw offloaded ESP packets Oliver Stäbler <oliver.staebler(a)bytesatwork.ch> arm64: dts: imx8mm/q: Fix pad control of SD1_DATA0 Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> drivers/net/wan/hdlc_fr: Fix a double free in pvc_xmit Eric Dumazet <edumazet(a)google.com> sch_red: fix off-by-one checks in red_check_params() Antoine Tenart <atenart(a)kernel.org> geneve: do not modify the shared tunnel info when PMTU triggers an ICMP reply Antoine Tenart <atenart(a)kernel.org> vxlan: do not modify the shared tunnel info when PMTU triggers an ICMP reply Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com> amd-xgbe: Update DMA coherency values Al Viro <viro(a)zeniv.linux.org.uk> hostfs: fix memory handling in follow_link() Eryk Rybak <eryk.roch.rybak(a)intel.com> i40e: Fix kernel oops when i40e driver removes VF's Mateusz Palczewski <mateusz.palczewski(a)intel.com> i40e: Added Asym_Pause to supported link modes Norbert Ciosek <norbertx.ciosek(a)intel.com> virtchnl: Fix layout of RSS structures Steffen Klassert <steffen.klassert(a)secunet.com> xfrm: Fix NULL pointer dereference on policy lookup Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: wm8960: Fix wrong bclk and lrclk with pll enabled for some chips Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> ASoC: SOF: Intel: HDA: fix core status verification Xin Long <lucien.xin(a)gmail.com> esp: delete NETIF_F_SCTP_CRC bit from features for esp offload Ahmed S. Darwish <a.darwish(a)linutronix.de> net: xfrm: Localize sequence counter per network namespace Carlos Leija <cileija(a)ti.com> ARM: OMAP4: PM: update ROM return address for OSWR and OFF Tony Lindgren <tony(a)atomide.com> ARM: OMAP4: Fix PMIC voltage domains for bionic Geert Uytterhoeven <geert+renesas(a)glider.be> regulator: bd9571mwv: Fix AVS and DVFS voltage range Arnd Bergmann <arnd(a)arndb.de> remoteproc: qcom: pil_info: avoid 64-bit division Evan Nimmo <evan.nimmo(a)alliedtelesis.co.nz> xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume Eyal Birger <eyal.birger(a)gmail.com> xfrm: interface: fix ipv4 pmtu check to honor ip header df Chinh T Cao <chinh.t.cao(a)intel.com> ice: Recognize 860 as iSCSI port in CEE mode Chinh T Cao <chinh.t.cao(a)intel.com> ice: Refactor DCB related variables out of the ice_port_info struct Vlad Buslov <vladbu(a)nvidia.com> net: sched: fix err handler in tcf_action_init() Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86/mmu: preserve pending TLB flush across calls to kvm_tdp_mmu_zap_sp Sean Christopherson <seanjc(a)google.com> KVM: x86/mmu: Don't allow TDP MMU to yield when recovering NX pages Sean Christopherson <seanjc(a)google.com> KVM: x86/mmu: Ensure TLBs are flushed for TDP MMU during NX zapping Sean Christopherson <seanjc(a)google.com> KVM: x86/mmu: Ensure TLBs are flushed when yielding during GFN range zap Ben Gardon <bgardon(a)google.com> KVM: x86/mmu: Yield in TDU MMU iter even if no SPTES changed Ben Gardon <bgardon(a)google.com> KVM: x86/mmu: Ensure forward progress when yielding in TDP MMU iter Ben Gardon <bgardon(a)google.com> KVM: x86/mmu: Rename goal_gfn to next_last_level_gfn Ben Gardon <bgardon(a)google.com> KVM: x86/mmu: Merge flush and non-flush tdp_mmu_iter_cond_resched Ben Gardon <bgardon(a)google.com> KVM: x86/mmu: change TDP MMU yield function returns to match cond_resched Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: turn recovery error on init to debug Roman Gushchin <guro(a)fb.com> percpu: make pcpu_nr_empty_pop_pages per chunk type Roman Bolshakov <r.bolshakov(a)yadro.com> scsi: target: iscsi: Fix zero tag inside a trace event Viswas G <Viswas.G(a)microchip.com> scsi: pm80xx: Fix chip initialization failure Saravana Kannan <saravanak(a)google.com> driver core: Fix locking bug in deferred_probe_timeout_work_func() Shuah Khan <skhan(a)linuxfoundation.org> usbip: synchronize event handler with sysfs code paths Shuah Khan <skhan(a)linuxfoundation.org> usbip: vudc synchronize sysfs code paths Shuah Khan <skhan(a)linuxfoundation.org> usbip: stub-dev synchronize sysfs code paths Shuah Khan <skhan(a)linuxfoundation.org> usbip: add sysfs_lock to synchronize sysfs code paths Dan Carpenter <dan.carpenter(a)oracle.com> thunderbolt: Fix off by one in tb_port_find_retimer() Dan Carpenter <dan.carpenter(a)oracle.com> thunderbolt: Fix a leak in tb_retimer_add() Paolo Abeni <pabeni(a)redhat.com> net: let skb_orphan_partial wake-up waiters. Maciej Żenczykowski <maze(a)google.com> net-ipv6: bugfix - raw & sctp - switch to ipv6_can_nonlocal_bind() Kurt Kanzenbach <kurt(a)linutronix.de> net: hsr: Reset MAC header for Tx path Johannes Berg <johannes.berg(a)intel.com> mac80211: fix TXQ AC confusion Ben Greear <greearb(a)candelatech.com> mac80211: fix time-is-after bug in mlme Johannes Berg <johannes.berg(a)intel.com> cfg80211: check S1G beacon compat element length Johannes Berg <johannes.berg(a)intel.com> nl80211: fix potential leak of ACL params Johannes Berg <johannes.berg(a)intel.com> nl80211: fix beacon head validation Vlad Buslov <vladbu(a)nvidia.com> net: sched: fix action overwrite reference counting Pavel Tikhomirov <ptikhomirov(a)virtuozzo.com> net: sched: sch_teql: fix null-pointer dereference Eli Cohen <elic(a)nvidia.com> vdpa/mlx5: Fix suspend/resume index restoration Arkadiusz Kubalewski <arkadiusz.kubalewski(a)intel.com> i40e: Fix sparse errors in i40e_txrx.c Arkadiusz Kubalewski <arkadiusz.kubalewski(a)intel.com> i40e: Fix sparse error: uninitialized symbol 'ring' Arkadiusz Kubalewski <arkadiusz.kubalewski(a)intel.com> i40e: Fix sparse error: 'vsi->netdev' could be null Arkadiusz Kubalewski <arkadiusz.kubalewski(a)intel.com> i40e: Fix sparse warning: missing error code 'err' Eric Dumazet <edumazet(a)google.com> virtio_net: Do not pull payload in skb->head Eric Dumazet <edumazet(a)google.com> net: ensure mac header is set in virtio_net_hdr_to_skb() John Fastabend <john.fastabend(a)gmail.com> bpf, sockmap: Fix incorrect fwd_alloc accounting John Fastabend <john.fastabend(a)gmail.com> bpf, sockmap: Fix sk->prot unhash op reset Dave Marchevsky <davemarchevsky(a)fb.com> bpf: Refcount task stack in bpf_get_task_stack Ciara Loftus <ciara.loftus(a)intel.com> libbpf: Only create rx and tx XDP rings when necessary Ciara Loftus <ciara.loftus(a)intel.com> libbpf: Restore umem state after socket create failure Ciara Loftus <ciara.loftus(a)intel.com> libbpf: Ensure umem pointer is non-NULL before dereferencing Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> ethernet/netronome/nfp: Fix a use after free in nfp_bpf_ctrl_msg_rx Lorenz Bauer <lmb(a)cloudflare.com> bpf: link: Refuse non-O_RDWR flags in BPF_OBJ_GET Toke Høiland-Jørgensen <toke(a)redhat.com> bpf: Enforce that struct_ops programs be GPL-only Pedro Tammela <pctammela(a)gmail.com> libbpf: Fix bail out from 'ringbuf_process_ring()' on error Anirudh Rayabharam <mail(a)anirudhrb.com> net: hso: fix null-ptr-deref during tty device unregistration Yongxin Liu <yongxin.liu(a)windriver.com> ice: fix memory leak of aRFS after resuming from suspend Johannes Berg <johannes.berg(a)intel.com> iwlwifi: pcie: properly set LTR workarounds on 22000 devices Robert Malz <robertx.malz(a)intel.com> ice: Cleanup fltr list in case of allocation issues Anirudh Venkataramanan <anirudh.venkataramanan(a)intel.com> ice: Use port number instead of PF ID for WoL Jacek Bułatek <jacekx.bulatek(a)intel.com> ice: Fix for dereference of NULL pointer Dave Ertman <david.m.ertman(a)intel.com> ice: remove DCBNL_DEVRESET bit from PF state Bruce Allan <bruce.w.allan(a)intel.com> ice: fix memory allocation call Krzysztof Goreczny <krzysztof.goreczny(a)intel.com> ice: prevent ice_open and ice_stop during reset Fabio Pricoco <fabio.pricoco(a)intel.com> ice: Increase control queue timeout Anirudh Venkataramanan <anirudh.venkataramanan(a)intel.com> ice: Continue probe on link/PHY errors Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> batman-adv: initialize "struct batadv_tvlv_tt_vlan_data"->reserved field Marek Behún <kabel(a)kernel.org> ARM: dts: turris-omnia: configure LED[2]/INTn pin as interrupt pin Gao Xiang <hsiangkao(a)redhat.com> parisc: avoid a warning on u8 cast for cmpxchg on u8 pointers Helge Deller <deller(a)gmx.de> parisc: parisc-agp requires SBA IOMMU driver Ilya Lipnitskiy <ilya.lipnitskiy(a)gmail.com> of: property: fw_devlink: do not link ".*,nr-gpios" Wong Vee Khee <vee.khee.wong(a)linux.intel.com> ethtool: fix incorrect datatype in set_eee ops Jack Qiu <jack.qiu(a)huawei.com> fs: direct-io: fix missing sdio->boundary Wengang Wang <wen.gang.wang(a)oracle.com> ocfs2: fix deadlock between setattr and dio_end_io_write Mike Rapoport <rppt(a)kernel.org> nds32: flush_dcache_page: use page_mapping_file to avoid races with swapoff Sergei Trofimovich <slyfox(a)gentoo.org> ia64: fix user_stack_pointer() for ptrace() Nick Desaulniers <ndesaulniers(a)google.com> gcov: re-fix clang-11+ support Al Viro <viro(a)zeniv.linux.org.uk> LOOKUP_MOUNTPOINT: we are cleaning "jumped" flag too late Mike Marciniszyn <mike.marciniszyn(a)cornelisnetworks.com> IB/hfi1: Fix probe time panic when AIP is enabled with a buggy BIOS Vitaly Kuznetsov <vkuznets(a)redhat.com> ACPI: processor: Fix build when CONFIG_ACPI_PROCESSOR=m Takashi Iwai <tiwai(a)suse.de> drm/i915: Fix invalid access to ACPI _DSM objects Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: dsa: lantiq_gswip: Configure all remaining GSWIP_MII_CFG bits Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: dsa: lantiq_gswip: Don't use PHY auto polling Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: dsa: lantiq_gswip: Let GSWIP automatically set the xMII clock Muhammad Usama Anjum <musamaanjum(a)gmail.com> net: ipv6: check for validity before dereferencing cfg->fc_nlinfo.nlh Luca Fancellu <luca.fancellu(a)arm.com> xen/evtchn: Change irq_info lock to raw_spinlock_t Ondrej Mosnacek <omosnace(a)redhat.com> selinux: fix race between old and new sidtab Ondrej Mosnacek <omosnace(a)redhat.com> selinux: fix cond_list corruption when changing booleans Ondrej Mosnacek <omosnace(a)redhat.com> selinux: make nslot handling in avtab more robust Xiaoming Ni <nixiaoming(a)huawei.com> nfc: Avoid endless loops caused by repeated llcp_sock_connect() Xiaoming Ni <nixiaoming(a)huawei.com> nfc: fix memory leak in llcp_sock_connect() Xiaoming Ni <nixiaoming(a)huawei.com> nfc: fix refcount leak in llcp_sock_connect() Xiaoming Ni <nixiaoming(a)huawei.com> nfc: fix refcount leak in llcp_sock_bind() Hans de Goede <hdegoede(a)redhat.com> ASoC: intel: atom: Stop advertising non working S24LE support Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant: Apply quirk for another HP ZBook G5 model Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek: Fix speaker amp setup on Acer Aspire E1 Jonas Holmberg <jonashg(a)axis.com> ALSA: aloop: Fix initialization of controls Dmitry Safonov <0x7f454c46(a)gmail.com> xfrm/compat: Cleanup WARN()s that can be user-triggered ------------- Diffstat: .../bindings/net/ethernet-controller.yaml | 2 +- Makefile | 4 +- arch/arm/boot/dts/armada-385-turris-omnia.dts | 1 + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 + arch/arm/mach-omap2/omap-secure.c | 39 +++++ arch/arm/mach-omap2/omap-secure.h | 1 + arch/arm/mach-omap2/pmic-cpcap.c | 4 +- arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 2 +- arch/arm64/boot/dts/freescale/imx8mq-pinfunc.h | 2 +- arch/ia64/include/asm/ptrace.h | 8 +- arch/nds32/mm/cacheflush.c | 2 +- arch/parisc/include/asm/cmpxchg.h | 2 +- arch/s390/kernel/cpcmd.c | 6 +- arch/x86/include/asm/smp.h | 2 +- arch/x86/kernel/smpboot.c | 26 ++- arch/x86/kvm/mmu/mmu.c | 13 +- arch/x86/kvm/mmu/tdp_iter.c | 30 +--- arch/x86/kvm/mmu/tdp_iter.h | 11 +- arch/x86/kvm/mmu/tdp_mmu.c | 99 +++++++---- arch/x86/kvm/mmu/tdp_mmu.h | 18 +- drivers/acpi/processor_idle.c | 4 +- drivers/base/dd.c | 8 +- drivers/char/agp/Kconfig | 2 +- drivers/clk/clk.c | 47 +++-- drivers/clk/socfpga/clk-gate.c | 2 +- drivers/gpio/gpiolib.c | 12 +- drivers/gpu/drm/i915/display/intel_acpi.c | 22 ++- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/vc4/vc4_crtc.c | 17 ++ drivers/i2c/busses/i2c-designware-master.c | 1 + drivers/i2c/busses/i2c-jz4780.c | 4 +- drivers/i2c/i2c-core-base.c | 7 +- drivers/infiniband/core/addr.c | 4 +- drivers/infiniband/hw/cxgb4/cm.c | 3 +- drivers/infiniband/hw/hfi1/affinity.c | 21 +-- drivers/infiniband/hw/hfi1/hfi.h | 1 + drivers/infiniband/hw/hfi1/init.c | 10 +- drivers/infiniband/hw/hfi1/netdev_rx.c | 3 +- drivers/infiniband/hw/qedr/verbs.c | 3 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- drivers/net/can/spi/mcp251x.c | 24 ++- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 +- drivers/net/dsa/lantiq_gswip.c | 195 ++++++++++++++++++--- drivers/net/ethernet/amd/xgbe/xgbe.h | 6 +- drivers/net/ethernet/cadence/macb_main.c | 7 + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 23 ++- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 3 +- drivers/net/ethernet/freescale/gianfar.c | 6 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 +- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 55 +++++- drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 12 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 + drivers/net/ethernet/intel/ice/ice.h | 4 +- drivers/net/ethernet/intel/ice/ice_common.c | 2 +- drivers/net/ethernet/intel/ice/ice_controlq.h | 4 +- drivers/net/ethernet/intel/ice/ice_dcb.c | 76 +++++--- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 47 ++--- drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 52 +++--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 8 +- drivers/net/ethernet/intel/ice/ice_lib.c | 7 +- drivers/net/ethernet/intel/ice/ice_main.c | 53 ++++-- drivers/net/ethernet/intel/ice/ice_switch.c | 15 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +- drivers/net/ethernet/intel/ice/ice_type.h | 17 +- drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 36 +++- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 22 +-- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 13 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 15 ++ .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 7 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 7 +- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 1 + drivers/net/ethernet/netronome/nfp/flower/main.h | 8 + .../net/ethernet/netronome/nfp/flower/metadata.c | 16 +- .../net/ethernet/netronome/nfp/flower/offload.c | 48 ++++- drivers/net/geneve.c | 24 ++- drivers/net/ieee802154/atusb.c | 1 + drivers/net/phy/bcm-phy-lib.c | 13 +- drivers/net/tun.c | 48 +++++ drivers/net/usb/hso.c | 33 ++-- drivers/net/virtio_net.c | 10 +- drivers/net/vxlan.c | 18 +- drivers/net/wan/hdlc_fr.c | 5 +- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 2 +- .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 31 +--- .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 3 +- .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 35 ++++ drivers/of/property.c | 11 +- drivers/ras/cec.c | 15 +- drivers/regulator/bd9571mwv-regulator.c | 4 +- drivers/remoteproc/qcom_pil_info.c | 2 +- drivers/scsi/pm8001/pm8001_hwi.c | 8 +- drivers/scsi/ufs/ufshcd.c | 31 ++-- drivers/soc/fsl/qbman/qman.c | 2 +- drivers/target/iscsi/iscsi_target.c | 3 +- drivers/thunderbolt/retimer.c | 4 +- drivers/usb/usbip/stub_dev.c | 11 +- drivers/usb/usbip/usbip_common.h | 3 + drivers/usb/usbip/usbip_event.c | 2 + drivers/usb/usbip/vhci_hcd.c | 1 + drivers/usb/usbip/vhci_sysfs.c | 30 +++- drivers/usb/usbip/vudc_dev.c | 1 + drivers/usb/usbip/vudc_sysfs.c | 5 + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 4 + drivers/vdpa/mlx5/net/mlx5_vnet.c | 40 +++-- drivers/xen/events/events_base.c | 12 +- fs/direct-io.c | 5 +- fs/hostfs/hostfs_kern.c | 7 +- fs/namei.c | 8 +- fs/ocfs2/aops.c | 11 +- fs/ocfs2/file.c | 8 +- include/linux/avf/virtchnl.h | 2 - include/linux/mlx5/mlx5_ifc.h | 10 +- include/linux/skmsg.h | 7 +- include/linux/virtio_net.h | 16 +- include/net/act_api.h | 12 +- include/net/netns/xfrm.h | 4 +- include/net/red.h | 4 +- include/net/sock.h | 9 + include/net/xfrm.h | 4 +- kernel/bpf/inode.c | 2 +- kernel/bpf/stackmap.c | 12 +- kernel/bpf/verifier.c | 5 + kernel/gcov/clang.c | 29 +-- kernel/locking/lockdep.c | 2 +- kernel/workqueue.c | 2 +- mm/percpu-internal.h | 2 +- mm/percpu-stats.c | 9 +- mm/percpu.c | 14 +- net/batman-adv/translation-table.c | 2 + net/can/bcm.c | 10 +- net/can/isotp.c | 11 +- net/can/raw.c | 14 +- net/core/skmsg.c | 12 +- net/core/sock.c | 12 +- net/core/xdp.c | 3 +- net/dsa/dsa2.c | 8 +- net/ethtool/eee.c | 4 +- net/hsr/hsr_device.c | 1 + net/hsr/hsr_forward.c | 6 - net/ieee802154/nl-mac.c | 7 +- net/ieee802154/nl802154.c | 23 ++- net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 2 +- net/ipv4/esp4_offload.c | 17 +- net/ipv4/udp.c | 4 + net/ipv6/ah6.c | 2 +- net/ipv6/esp6.c | 2 +- net/ipv6/esp6_offload.c | 17 +- net/ipv6/raw.c | 2 +- net/ipv6/route.c | 8 +- net/mac80211/mlme.c | 5 +- net/mac80211/tx.c | 2 +- net/mac802154/llsec.c | 2 +- net/mptcp/protocol.c | 45 +++++ net/ncsi/ncsi-manage.c | 20 ++- net/nfc/llcp_sock.c | 10 ++ net/openvswitch/conntrack.c | 14 +- net/qrtr/qrtr.c | 5 +- net/rds/message.c | 3 +- net/sched/act_api.c | 48 +++-- net/sched/cls_api.c | 16 +- net/sched/sch_teql.c | 3 + net/sctp/ipv6.c | 7 +- net/tipc/crypto.c | 3 +- net/tipc/socket.c | 2 +- net/wireless/nl80211.c | 10 +- net/wireless/scan.c | 14 +- net/wireless/sme.c | 2 +- net/xfrm/xfrm_compat.c | 12 +- net/xfrm/xfrm_device.c | 2 - net/xfrm/xfrm_interface.c | 3 + net/xfrm/xfrm_output.c | 10 +- net/xfrm/xfrm_state.c | 10 +- security/selinux/ss/avtab.c | 101 ++++------- security/selinux/ss/avtab.h | 2 +- security/selinux/ss/conditional.c | 12 +- security/selinux/ss/services.c | 157 +++++++++++++---- security/selinux/ss/sidtab.c | 21 +++ security/selinux/ss/sidtab.h | 4 + sound/drivers/aloop.c | 11 +- sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 16 ++ sound/soc/codecs/wm8960.c | 8 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 6 +- sound/soc/sof/intel/hda-dsp.c | 15 +- sound/soc/sunxi/sun4i-codec.c | 5 + tools/lib/bpf/ringbuf.c | 2 +- tools/lib/bpf/xsk.c | 57 +++--- tools/perf/builtin-inject.c | 2 +- tools/perf/util/block-info.c | 6 +- 194 files changed, 1844 insertions(+), 870 deletions(-)

3 years, 9 months

12
200
0 0

[PATCH 08/12] drm/nouveau: Don't set allow_fb_modifiers explicitly

by Daniel Vetter

Since commit 890880ddfdbe256083170866e49c87618b706ac7 Author: Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> Date: Fri Jan 4 09:56:10 2019 +0100 drm: Auto-set allow_fb_modifiers when given modifiers at plane init this is done automatically as part of plane init, if drivers set the modifier list correctly. Which is the case here. Note that this fixes an inconsistency: We've set the cap everywhere, but only nv50+ supports modifiers. Hence cc stable, but not further back then the patch from Paul. Cc: stable(a)vger.kernel.org # v5.1 + Cc: Pekka Paalanen <pekka.paalanen(a)collabora.com> Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: nouveau(a)lists.freedesktop.org --- drivers/gpu/drm/nouveau/nouveau_display.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 14101bd2a0ff..929de41c281f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -697,7 +697,6 @@ nouveau_display_create(struct drm_device *dev) dev->mode_config.preferred_depth = 24; dev->mode_config.prefer_shadow = 1; - dev->mode_config.allow_fb_modifiers = true; if (drm->client.device.info.chipset < 0x11) dev->mode_config.async_page_flip = false; -- 2.31.0

3 years, 9 months

1
0
0 0

[PATCH 07/12] drm/msm/mdp4: Fix modifier support enabling

by Daniel Vetter

Setting the cap without the modifier list is very confusing to userspace. Fix that by listing the ones we support explicitly. Stable backport so that userspace can rely on this working in a reasonable way, i.e. that the cap set implies IN_FORMATS is available. Cc: stable(a)vger.kernel.org Cc: Pekka Paalanen <pekka.paalanen(a)collabora.com> Cc: Rob Clark <robdclark(a)chromium.org> Cc: Jordan Crouse <jordan(a)cosmicpenguin.net> Cc: Emil Velikov <emil.velikov(a)collabora.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> --- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 -- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index 3d729270bde1..4a5b518288b0 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -88,8 +88,6 @@ static int mdp4_hw_init(struct msm_kms *kms) if (mdp4_kms->rev > 1) mdp4_write(mdp4_kms, REG_MDP4_RESET_STATUS, 1); - dev->mode_config.allow_fb_modifiers = true; - out: pm_runtime_put_sync(dev->dev); diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c index 9aecca919f24..49bdabea8ed5 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c @@ -349,6 +349,12 @@ enum mdp4_pipe mdp4_plane_pipe(struct drm_plane *plane) return mdp4_plane->pipe; } +static const uint64_t supported_format_modifiers[] = { + DRM_FORMAT_MOD_SAMSUNG_64_32_TILE, + DRM_FORMAT_MOD_LINEAR, + DRM_FORMAT_MOD_INVALID +}; + /* initialize plane */ struct drm_plane *mdp4_plane_init(struct drm_device *dev, enum mdp4_pipe pipe_id, bool private_plane) @@ -377,7 +383,7 @@ struct drm_plane *mdp4_plane_init(struct drm_device *dev, type = private_plane ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY; ret = drm_universal_plane_init(dev, plane, 0xff, &mdp4_plane_funcs, mdp4_plane->formats, mdp4_plane->nformats, - NULL, type, NULL); + supported_format_modifiers, type, NULL); if (ret) goto fail; -- 2.31.0

3 years, 9 months

1
0
0 0

[PATCH 02/12] drm/arm/malidp: Always list modifiers

by Daniel Vetter

Even when all we support is linear, make that explicit. Otherwise the uapi is rather confusing. Cc: stable(a)vger.kernel.org Cc: Pekka Paalanen <pekka.paalanen(a)collabora.com> Cc: Liviu Dudau <liviu.dudau(a)arm.com> Cc: Brian Starkey <brian.starkey(a)arm.com> Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> --- drivers/gpu/drm/arm/malidp_planes.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c index ddbba67f0283..8c2ab3d653b7 100644 --- a/drivers/gpu/drm/arm/malidp_planes.c +++ b/drivers/gpu/drm/arm/malidp_planes.c @@ -927,6 +927,11 @@ static const struct drm_plane_helper_funcs malidp_de_plane_helper_funcs = { .atomic_disable = malidp_de_plane_disable, }; +static const uint64_t linear_only_modifiers[] = { + DRM_FORMAT_MOD_LINEAR, + DRM_FORMAT_MOD_INVALID +}; + int malidp_de_planes_init(struct drm_device *drm) { struct malidp_drm *malidp = drm->dev_private; @@ -990,8 +995,8 @@ int malidp_de_planes_init(struct drm_device *drm) */ ret = drm_universal_plane_init(drm, &plane->base, crtcs, &malidp_de_plane_funcs, formats, n, - (id == DE_SMART) ? NULL : modifiers, plane_type, - NULL); + (id == DE_SMART) ? linear_only_modifiers : modifiers, + plane_type, NULL); if (ret < 0) goto cleanup; -- 2.31.0

3 years, 9 months

1
0
0 0

[PATCH] nvme: put some AMD PCIE downstream NVME device to simple suspend/resume path

by Prike Liang

The NVME device pluged in some AMD PCIE root port will resume timeout from s2idle which caused by NVME power CFG lost in the SMU FW restore. This issue can be workaround by using PCIe power set with simple suspend/resume process path instead of APST. In the onwards ASIC will try do the NVME shutdown save and restore in the BIOS and still need PCIe power setting to resume from RTD3 for s2idle. Signed-off-by: Prike Liang <Prike.Liang(a)amd.com> Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com> Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> Cc: <stable(a)vger.kernel.org> # 5.11+ --- drivers/nvme/host/pci.c | 5 +++++ drivers/pci/quirks.c | 10 ++++++++++ include/linux/pci.h | 2 ++ include/linux/pci_ids.h | 1 + 4 files changed, 18 insertions(+) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 6bad4d4..dd46d9e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2832,6 +2832,7 @@ static bool nvme_acpi_storage_d3(struct pci_dev *dev) { struct acpi_device *adev; struct pci_dev *root; + struct pci_dev *rdev; acpi_handle handle; acpi_status status; u8 val; @@ -2845,6 +2846,10 @@ static bool nvme_acpi_storage_d3(struct pci_dev *dev) if (!root) return false; + rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0)); + if (rdev->dev_flags & PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND) + return NVME_QUIRK_SIMPLE_SUSPEND; + adev = ACPI_COMPANION(&root->dev); if (!adev) return false; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 653660e3..0b175ce 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -312,6 +312,16 @@ static void quirk_nopciamd(struct pci_dev *dev) } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8151_0, quirk_nopciamd); +static void quirk_amd_nvme_fixup(struct pci_dev *dev) +{ + struct pci_dev *rdev; + + dev->dev_flags |= PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND; + pci_info(dev, "AMD simple suspend opt enabled\n"); + +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CZN_RP, quirk_amd_nvme_fixup); + /* Triton requires workarounds to be used by the drivers */ static void quirk_triton(struct pci_dev *dev) { diff --git a/include/linux/pci.h b/include/linux/pci.h index 53f4904..a6e1b1b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -227,6 +227,8 @@ enum pci_dev_flags { PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10), /* Don't use Relaxed Ordering for TLPs directed at this device */ PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11), + /* AMD simple suspend opt quirk */ + PCI_DEV_FLAGS_AMD_NVME_SIMPLE_SUSPEND = (__force pci_dev_flags_t) (1 << 12), }; enum pci_irq_reroute_variant { diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d8156a5..a82443f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -602,6 +602,7 @@ #define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS 0x780b #define PCI_DEVICE_ID_AMD_HUDSON2_IDE 0x780c #define PCI_DEVICE_ID_AMD_KERNCZ_SMBUS 0x790b +#define PCI_DEVICE_ID_AMD_CZN_RP 0x1630 #define PCI_VENDOR_ID_TRIDENT 0x1023 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 -- 2.7.4

3 years, 9 months

3
3
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2021