linux-kernel - [PATCH v2 1/1] usb:xhci: update condition to select bus->sysdev from parent device

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 19 Aug 2017 10:43:40 +0700
From:   "Thang Q. Nguyen" <tqnguyen@....com>
To:     Mathias Nyman <mathias.nyman@...el.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:     Thang Nguyen <tqnguyen@....com>, Tung Nguyen <tunguyen@....com>,
        Phong Vo <pvo@....com>, Loc Ho <lho@....com>, patches@....com
Subject: [PATCH v2 1/1] usb:xhci: update condition to select bus->sysdev from parent device

From: "Thang Q. Nguyen" <tqnguyen@....com>

For commit 4c39d4b949d3 ("usb: xhci: use bus->sysdev for DMA
configuration"), sysdev points to devices known to the system firmware
or hardware for DMA parameters.
However, the parent of the system firmware/hardware device checking
logic does not work in ACPI boot mode. This patch updates the formulation
to check this case in both DT and ACPI.

Signed-off-by: Tung Nguyen <tunguyen@....com>
Signed-off-by: Thang Q. Nguyen <tqnguyen@....com>
---
Change since v1:
 - Update codes to work with kernel 4.13-rc5
---
 drivers/usb/host/xhci-plat.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index c04144b..1bb9729 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -187,7 +187,10 @@ static int xhci_plat_probe(struct platform_device *pdev)
 	 * 3. xhci_plat is grandchild of a pci device (dwc3-pci)
 	 */
 	sysdev = &pdev->dev;
-	if (sysdev->parent && !sysdev->of_node && sysdev->parent->of_node)
+	if (sysdev->parent && !is_of_node(sysdev->fwnode) &&
+			!is_acpi_device_node(sysdev->fwnode) &&
+			(is_of_node(sysdev->parent->fwnode) ||
+			 is_acpi_device_node(sysdev->parent->fwnode)))
 		sysdev = sysdev->parent;
 #ifdef CONFIG_PCI
 	else if (sysdev->parent && sysdev->parent->parent &&
-- 
1.8.3.1