tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'char-misc-5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH:
"Here are some small char/misc driver fixes for 5.6-rc3.

Also included in here are some updates for some documentation files
that I seem to be maintaining these days.

The driver fixes are:
- small fixes for the habanalabs driver
- fsi driver bugfix

All of these have been in linux-next for a while with no reported
issues"

* tag 'char-misc-5.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
Documentation/process: Swap out the ambassador for Canonical
habanalabs: patched cb equals user cb in device memset
habanalabs: do not halt CoreSight during hard reset
habanalabs: halt the engines before hard-reset
MAINTAINERS: remove unnecessary ':' characters
fsi: aspeed: add unspecified HAS_IOMEM dependency
COPYING: state that all contributions really are covered by this file
Documentation/process: Change Microsoft contact for embargoed hardware issues
embargoed-hardware-issues: drop Amazon contact as the email address now bounces
Documentation/process: Add Arm contact for embargoed HW issues

Linus Torvalds bb65619e e5553ac7

+65 -19
+2
COPYING
··· 16 16 Documentation/process/license-rules.rst 17 17 18 18 for more details. 19 + 20 + All contributions to the Linux Kernel are subject to this COPYING file.
+4 -4
Documentation/process/embargoed-hardware-issues.rst
··· 244 244 an involved disclosed party. The current ambassadors list: 245 245 246 246 ============= ======================================================== 247 - ARM 247 + ARM Grant Likely <grant.likely@arm.com> 248 248 AMD Tom Lendacky <tom.lendacky@amd.com> 249 249 IBM 250 250 Intel Tony Luck <tony.luck@intel.com> 251 251 Qualcomm Trilok Soni <tsoni@codeaurora.org> 252 252 253 - Microsoft Sasha Levin <sashal@kernel.org> 253 + Microsoft James Morris <jamorris@linux.microsoft.com> 254 254 VMware 255 255 Xen Andrew Cooper <andrew.cooper3@citrix.com> 256 256 257 - Canonical Tyler Hicks <tyhicks@canonical.com> 257 + Canonical John Johansen <john.johansen@canonical.com> 258 258 Debian Ben Hutchings <ben@decadent.org.uk> 259 259 Oracle Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 260 260 Red Hat Josh Poimboeuf <jpoimboe@redhat.com> 261 261 SUSE Jiri Kosina <jkosina@suse.cz> 262 262 263 - Amazon Peter Bowen <pzb@amzn.com> 263 + Amazon 264 264 Google Kees Cook <keescook@chromium.org> 265 265 ============= ======================================================== 266 266
+1 -1
Documentation/translations/zh_CN/process/embargoed-hardware-issues.rst
··· 183 183 VMware 184 184 Xen Andrew Cooper <andrew.cooper3@citrix.com> 185 185 186 - Canonical Tyler Hicks <tyhicks@canonical.com> 186 + Canonical John Johansen <john.johansen@canonical.com> 187 187 Debian Ben Hutchings <ben@decadent.org.uk> 188 188 Oracle Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 189 189 Red Hat Josh Poimboeuf <jpoimboe@redhat.com>
+11 -11
MAINTAINERS
··· 3909 3909 F: Documentation/filesystems/ceph.txt 3910 3910 F: fs/ceph/ 3911 3911 3912 - CERTIFICATE HANDLING: 3912 + CERTIFICATE HANDLING 3913 3913 M: David Howells <dhowells@redhat.com> 3914 3914 M: David Woodhouse <dwmw2@infradead.org> 3915 3915 L: keyrings@vger.kernel.org ··· 3919 3919 F: scripts/sign-file.c 3920 3920 F: scripts/extract-cert.c 3921 3921 3922 - CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: 3922 + CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM 3923 3923 L: devel@driverdev.osuosl.org 3924 3924 S: Obsolete 3925 3925 F: drivers/staging/wusbcore/ ··· 7047 7047 S: Supported 7048 7048 F: drivers/uio/uio_pci_generic.c 7049 7049 7050 - GENERIC VDSO LIBRARY: 7050 + GENERIC VDSO LIBRARY 7051 7051 M: Andy Lutomirski <luto@kernel.org> 7052 7052 M: Thomas Gleixner <tglx@linutronix.de> 7053 7053 M: Vincenzo Frascino <vincenzo.frascino@arm.com> ··· 9278 9278 F: security/keys/trusted.c 9279 9279 F: include/keys/trusted.h 9280 9280 9281 - KEYS/KEYRINGS: 9281 + KEYS/KEYRINGS 9282 9282 M: David Howells <dhowells@redhat.com> 9283 9283 M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> 9284 9284 L: keyrings@vger.kernel.org ··· 11484 11484 F: drivers/scsi/sun3_scsi.* 11485 11485 F: drivers/scsi/sun3_scsi_vme.c 11486 11486 11487 - NCSI LIBRARY: 11487 + NCSI LIBRARY 11488 11488 M: Samuel Mendoza-Jonas <sam@mendozajonas.com> 11489 11489 S: Maintained 11490 11490 F: net/ncsi/ ··· 13512 13512 S: Maintained 13513 13513 F: drivers/block/ps3vram.c 13514 13514 13515 - PSAMPLE PACKET SAMPLING SUPPORT: 13515 + PSAMPLE PACKET SAMPLING SUPPORT 13516 13516 M: Yotam Gigi <yotam.gi@gmail.com> 13517 13517 S: Maintained 13518 13518 F: net/psample ··· 17080 17080 F: Documentation/admin-guide/ufs.rst 17081 17081 F: fs/ufs/ 17082 17082 17083 - UHID USERSPACE HID IO DRIVER: 17083 + UHID USERSPACE HID IO DRIVER 17084 17084 M: David Herrmann <dh.herrmann@googlemail.com> 17085 17085 L: linux-input@vger.kernel.org 17086 17086 S: Maintained ··· 17094 17094 F: drivers/usb/common/ulpi.c 17095 17095 F: include/linux/ulpi/ 17096 17096 17097 - ULTRA-WIDEBAND (UWB) SUBSYSTEM: 17097 + ULTRA-WIDEBAND (UWB) SUBSYSTEM 17098 17098 L: devel@driverdev.osuosl.org 17099 17099 S: Obsolete 17100 17100 F: drivers/staging/uwb/ 17101 17101 17102 - UNICODE SUBSYSTEM: 17102 + UNICODE SUBSYSTEM 17103 17103 M: Gabriel Krisman Bertazi <krisman@collabora.com> 17104 17104 L: linux-fsdevel@vger.kernel.org 17105 17105 S: Supported 17106 17106 F: fs/unicode/ 17107 17107 17108 - UNICORE32 ARCHITECTURE: 17108 + UNICORE32 ARCHITECTURE 17109 17109 M: Guan Xuetao <gxt@pku.edu.cn> 17110 17110 W: http://mprc.pku.edu.cn/~guanxuetao/linux 17111 17111 S: Maintained ··· 17791 17791 F: include/uapi/linux/vbox*.h 17792 17792 F: drivers/virt/vboxguest/ 17793 17793 17794 - VIRTUAL BOX SHARED FOLDER VFS DRIVER: 17794 + VIRTUAL BOX SHARED FOLDER VFS DRIVER 17795 17795 M: Hans de Goede <hdegoede@redhat.com> 17796 17796 L: linux-fsdevel@vger.kernel.org 17797 17797 S: Maintained
+1
drivers/fsi/Kconfig
··· 55 55 56 56 config FSI_MASTER_ASPEED 57 57 tristate "FSI ASPEED master" 58 + depends on HAS_IOMEM 58 59 help 59 60 This option enables a FSI master that is present behind an OPB bridge 60 61 in the AST2600.
+4 -1
drivers/misc/habanalabs/device.c
··· 598 598 goto out; 599 599 } 600 600 601 - hdev->asic_funcs->halt_coresight(hdev); 601 + if (!hdev->hard_reset_pending) 602 + hdev->asic_funcs->halt_coresight(hdev); 603 + 602 604 hdev->in_debug = 0; 603 605 604 606 goto out; ··· 1191 1189 if (hdev->asic_funcs->get_hw_state(hdev) == HL_DEVICE_HW_STATE_DIRTY) { 1192 1190 dev_info(hdev->dev, 1193 1191 "H/W state is dirty, must reset before initializing\n"); 1192 + hdev->asic_funcs->halt_engines(hdev, true); 1194 1193 hdev->asic_funcs->hw_fini(hdev, true); 1195 1194 } 1196 1195
+42 -2
drivers/misc/habanalabs/goya/goya.c
··· 895 895 */ 896 896 static void goya_disable_external_queues(struct hl_device *hdev) 897 897 { 898 + struct goya_device *goya = hdev->asic_specific; 899 + 900 + if (!(goya->hw_cap_initialized & HW_CAP_DMA)) 901 + return; 902 + 898 903 WREG32(mmDMA_QM_0_GLBL_CFG0, 0); 899 904 WREG32(mmDMA_QM_1_GLBL_CFG0, 0); 900 905 WREG32(mmDMA_QM_2_GLBL_CFG0, 0); ··· 960 955 static int goya_stop_external_queues(struct hl_device *hdev) 961 956 { 962 957 int rc, retval = 0; 958 + 959 + struct goya_device *goya = hdev->asic_specific; 960 + 961 + if (!(goya->hw_cap_initialized & HW_CAP_DMA)) 962 + return retval; 963 963 964 964 rc = goya_stop_queue(hdev, 965 965 mmDMA_QM_0_GLBL_CFG1, ··· 1754 1744 */ 1755 1745 static void goya_disable_internal_queues(struct hl_device *hdev) 1756 1746 { 1747 + struct goya_device *goya = hdev->asic_specific; 1748 + 1749 + if (!(goya->hw_cap_initialized & HW_CAP_MME)) 1750 + goto disable_tpc; 1751 + 1757 1752 WREG32(mmMME_QM_GLBL_CFG0, 0); 1758 1753 WREG32(mmMME_CMDQ_GLBL_CFG0, 0); 1754 + 1755 + disable_tpc: 1756 + if (!(goya->hw_cap_initialized & HW_CAP_TPC)) 1757 + return; 1759 1758 1760 1759 WREG32(mmTPC0_QM_GLBL_CFG0, 0); 1761 1760 WREG32(mmTPC0_CMDQ_GLBL_CFG0, 0); ··· 1801 1782 */ 1802 1783 static int goya_stop_internal_queues(struct hl_device *hdev) 1803 1784 { 1785 + struct goya_device *goya = hdev->asic_specific; 1804 1786 int rc, retval = 0; 1787 + 1788 + if (!(goya->hw_cap_initialized & HW_CAP_MME)) 1789 + goto stop_tpc; 1805 1790 1806 1791 /* 1807 1792 * Each queue (QMAN) is a separate H/W logic. That means that each ··· 1832 1809 dev_err(hdev->dev, "failed to stop MME CMDQ\n"); 1833 1810 retval = -EIO; 1834 1811 } 1812 + 1813 + stop_tpc: 1814 + if (!(goya->hw_cap_initialized & HW_CAP_TPC)) 1815 + return retval; 1835 1816 1836 1817 rc = goya_stop_queue(hdev, 1837 1818 mmTPC0_QM_GLBL_CFG1, ··· 2002 1975 2003 1976 static void goya_dma_stall(struct hl_device *hdev) 2004 1977 { 1978 + struct goya_device *goya = hdev->asic_specific; 1979 + 1980 + if (!(goya->hw_cap_initialized & HW_CAP_DMA)) 1981 + return; 1982 + 2005 1983 WREG32(mmDMA_QM_0_GLBL_CFG1, 1 << DMA_QM_0_GLBL_CFG1_DMA_STOP_SHIFT); 2006 1984 WREG32(mmDMA_QM_1_GLBL_CFG1, 1 << DMA_QM_1_GLBL_CFG1_DMA_STOP_SHIFT); 2007 1985 WREG32(mmDMA_QM_2_GLBL_CFG1, 1 << DMA_QM_2_GLBL_CFG1_DMA_STOP_SHIFT); ··· 2016 1984 2017 1985 static void goya_tpc_stall(struct hl_device *hdev) 2018 1986 { 1987 + struct goya_device *goya = hdev->asic_specific; 1988 + 1989 + if (!(goya->hw_cap_initialized & HW_CAP_TPC)) 1990 + return; 1991 + 2019 1992 WREG32(mmTPC0_CFG_TPC_STALL, 1 << TPC0_CFG_TPC_STALL_V_SHIFT); 2020 1993 WREG32(mmTPC1_CFG_TPC_STALL, 1 << TPC1_CFG_TPC_STALL_V_SHIFT); 2021 1994 WREG32(mmTPC2_CFG_TPC_STALL, 1 << TPC2_CFG_TPC_STALL_V_SHIFT); ··· 2033 1996 2034 1997 static void goya_mme_stall(struct hl_device *hdev) 2035 1998 { 1999 + struct goya_device *goya = hdev->asic_specific; 2000 + 2001 + if (!(goya->hw_cap_initialized & HW_CAP_MME)) 2002 + return; 2003 + 2036 2004 WREG32(mmMME_STALL, 0xFFFFFFFF); 2037 2005 } 2038 2006 ··· 4689 4647 hl_debugfs_add_job(hdev, job); 4690 4648 4691 4649 rc = goya_send_job_on_qman0(hdev, job); 4692 - 4693 - hl_cb_put(job->patched_cb); 4694 4650 4695 4651 hl_debugfs_remove_job(hdev, job); 4696 4652 kfree(job);