Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kkT8n-0001JF-KU for mharc-grub-devel@gnu.org; Wed, 02 Dec 2020 09:29:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkPPC-0005HF-9d for grub-devel@gnu.org; Wed, 02 Dec 2020 05:30:38 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:38597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkPP3-0007jY-7Q for grub-devel@gnu.org; Wed, 02 Dec 2020 05:30:37 -0500 Received: by mail-wm1-x341.google.com with SMTP id g185so6431951wmf.3 for ; Wed, 02 Dec 2020 02:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gjsanv0kqtuH6yh3NP9eZHSZVBMiT9LjA7CK3ZysXrU=; b=Uwkek3Iy6uAYon7e1N24cWfjy11O8pdTXIqXsa3nhtsTMEs4E6M/DQ/SXEPS9315SW L8FWHGEB8Lhut4xq6P7CuG/GAwrvOmHd/hpdD3G6ULoHTDew6IfI32SRt9AN1/9Mnofi v4VT5m2CX4Dr2QMxDbtI3W5rXWdmOsO4FXo4fnlXo3t/rk+Xzz9T78d2DgjXddYzEssB DwX+WvfEugXlIAWYLboMMa0J42VroMTIGIcDUWtzgmPLjTFe9oqbtqzcE2xApozfTnJa 3gRYxLV+0n3U5THaVfC2nk0VkoPJK8auzknNzx8FT5dVG8mNGFDXOmn6gUBgO5zDorng /r7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gjsanv0kqtuH6yh3NP9eZHSZVBMiT9LjA7CK3ZysXrU=; b=KUfr+yCsk6LKnc9NyFXhZODVRDymHL90wc6VKHQIvhePwvOjq80MYgPpvMXZTvZLYb MSJGmuQmTsZfzsFZ7azI/DcUuWdOziMKN7r78f7Fy8Lwx+mO/0JFOFIswl+s1y3+F66e 4uOolwkIUmB5j9TcehKcn8swqlu0399hgKj8x3ztvsFLBxv+kXZYSaJtGqdy9H4tL9Qd ZnB0JjeHxx1XlhACkUTZ0dS7yUVA2Gz8GAaB52DnJzWOVsCIiiU8MMzyJB6MLxNWwRZu CoZwe1KdcfA3YRUKOKIavQ+yVpj8rtk1ihIGMnf7+OVYYLEapZYZ5W4twhT0cv1QyE6E fCdA== X-Gm-Message-State: AOAM530OdTMqYZI0vle+Yfoi6543aePcCk3gdt9svZQMZp+20QSO5mpy g2Q7tZjvGMs5A40RXs3+VEjcouotRdyM/LL7 X-Google-Smtp-Source: ABdhPJwBzvFRJf6qoR3dxsd5AUAlKtYgmOXYF302dsvPcRPAeNSabtZGjxQSvalnNOh7FGV+29Mg5Q== X-Received: by 2002:a1c:43c6:: with SMTP id q189mr2408897wma.7.1606905027047; Wed, 02 Dec 2020 02:30:27 -0800 (PST) Received: from rudolphp-notebook.9e.network (b2b-78-94-0-50.unitymedia.biz. [78.94.0.50]) by smtp.gmail.com with ESMTPSA id f17sm1493859wmh.10.2020.12.02.02.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 02:30:26 -0800 (PST) From: Patrick Rudolph To: grub-devel@gnu.org Cc: Patrick Rudolph Subject: [PATCH 5/6] grub-core/bus/usb/usbhub: Add new private fields for xHCI controller Date: Wed, 2 Dec 2020 11:29:26 +0100 Message-Id: <20201202102927.643312-6-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201202102927.643312-1-patrick.rudolph@9elements.com> References: <20201202102927.643312-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=patrick.rudolph@9elements.com; helo=mail-wm1-x341.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 02 Dec 2020 09:29:55 -0500 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2020 10:30:38 -0000 Store the root port number, the route, consisting out of the port ID in each nibble, and a pointer to driver private data. Signed-off-by: Patrick Rudolph --- grub-core/bus/usb/usbhub.c | 14 ++++++++++---- include/grub/usb.h | 5 +++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c index df1913aee..63bee1d1a 100644 --- a/grub-core/bus/usb/usbhub.c +++ b/grub-core/bus/usb/usbhub.c @@ -49,7 +49,9 @@ static grub_usb_controller_dev_t grub_usb_list; static grub_usb_device_t grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed, - int split_hubport, int split_hubaddr) + int split_hubport, int split_hubaddr, + int root_portno, + grub_uint32_t route) { grub_usb_device_t dev; int i; @@ -65,6 +67,8 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, dev->speed = speed; dev->split_hubport = split_hubport; dev->split_hubaddr = split_hubaddr; + dev->root_port = root_portno; + dev->route = route; if (controller->dev->attach_dev) { err = controller->dev->attach_dev (controller, dev); @@ -245,7 +249,7 @@ attach_root_port (struct grub_usb_hub *hub, int portno, and full/low speed device connected to OHCI/UHCI needs not transaction translation - e.g. hubport and hubaddr should be always none (zero) for any device connected to any root hub. */ - dev = grub_usb_hub_add_dev (hub->controller, speed, 0, 0); + dev = grub_usb_hub_add_dev (hub->controller, speed, 0, 0, portno, 0); hub->controller->dev->pending_reset = 0; npending--; if (! dev) @@ -673,10 +677,12 @@ poll_nonroot_hub (grub_usb_device_t dev) split_hubport = dev->split_hubport; split_hubaddr = dev->split_hubaddr; } - + + /* Add the device and assign a device address to it. */ next_dev = grub_usb_hub_add_dev (&dev->controller, speed, - split_hubport, split_hubaddr); + split_hubport, split_hubaddr, dev->root_port, + dev->route << 4 | (i & 0xf)); if (dev->controller.dev->pending_reset) { dev->controller.dev->pending_reset = 0; diff --git a/include/grub/usb.h b/include/grub/usb.h index 5c5fb5ec4..5a3325b7d 100644 --- a/include/grub/usb.h +++ b/include/grub/usb.h @@ -233,6 +233,11 @@ struct grub_usb_device int split_hubport; int split_hubaddr; + + /* xHCI specific information */ + int root_port; + grub_uint32_t route; + void *xhci_priv; }; -- 2.26.2