Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kkT8q-0001Px-8P for mharc-grub-devel@gnu.org; Wed, 02 Dec 2020 09:30:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkPPB-0005GQ-Sg for grub-devel@gnu.org; Wed, 02 Dec 2020 05:30:37 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42340) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkPP3-0007iC-52 for grub-devel@gnu.org; Wed, 02 Dec 2020 05:30:37 -0500 Received: by mail-wr1-x443.google.com with SMTP id l1so3109212wrb.9 for ; Wed, 02 Dec 2020 02:30:25 -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=R7ZsrHA/VokvtxARbS4w6ak/k6t/iEHANArvWytKLw4=; b=Qma6f3OFD09rovuhAqFV/Vtp4PmBnAD6ji+LMy6n+dpS5rf1WmKoEwtVwLcijFuN10 W8opkaR9PEHi9u+GU4vP4JNhlR8OAbEoP/IIZwjmOtUCcpdBDlkDzJUzAwQMUXOIxakt grBHgi3V91CXQewjdSn4oX9IGZV7SNRYosReGGFr+M2b4BpPy1z0WeJxq+VA8YWBQ7LQ tMx5ZWm1FZOTvCVjn+AcCHBer9Bs0oclrnntCwMgpORmbhcjpmapsIxmdVykq14t51/Z V+Ll+cv2UqBS59Gp++PMkA0CgG7DtbBaIRp4WJeM9CkqmVoJzChY0xa9Auavlc813cKI aXAg== 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=R7ZsrHA/VokvtxARbS4w6ak/k6t/iEHANArvWytKLw4=; b=ZsRwCP2bqZUk5DkvKW34M6UC3dit5FXWpePLcctnYFbpUGfaCY4/4TEkOeZKF4grW0 HtFTrbLObcLnCHWiq9pofV4X1qMWwHSUnEpT2t9VuETCuQPrbjlIJEd3ftIfvce4ao1M SnZB5kORFZouOYL1VvL47HrHeP9P4Gc7N6M86OES4uTVrqtfVeR/VNA/oh9pXodziy+M Q9KgSuVonR4N5KMduo6G1FsRD6kCi9pYgPu0aEvhOITiPFBXu4Dg/NxdARYtiloGw5Zi 3jrwcVbDfT/DL+wELpskPd3m2MG+0vPJlNuwT/VKYokPYQWWzQtdMxNCQiBFmhdwAAko nOMw== X-Gm-Message-State: AOAM530iXMlK/qGewDn2NPpj4HTF/47GIrXNApxVcH0xjWA4BydzM9+j IhokFIPS2YJb5DmKYAfXxU5aG7j/7qHDtWKS X-Google-Smtp-Source: ABdhPJxvl6Pdl5ZE5BUJAh7uo3V8xhQyQWgecpbrhfSwBCMANUojJwhWvKsgqeETw1X2hhZeFTNwVg== X-Received: by 2002:adf:fe51:: with SMTP id m17mr2645662wrs.98.1606905024538; Wed, 02 Dec 2020 02:30:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 02:30:23 -0800 (PST) From: Patrick Rudolph To: grub-devel@gnu.org Cc: Patrick Rudolph Subject: [PATCH 4/6] grub-core/bus/usb: Add function pointer for attach/detach events Date: Wed, 2 Dec 2020 11:29:25 +0100 Message-Id: <20201202102927.643312-5-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::443; envelope-from=patrick.rudolph@9elements.com; helo=mail-wr1-x443.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 The xHCI code needs to be called for attaching or detaching a device. Introduce two functions pointers and call it from the USB hub code. Will be used in future commits, currently this doesn't change any functionality. Signed-off-by: Patrick Rudolph --- grub-core/bus/usb/ehci.c | 2 ++ grub-core/bus/usb/ohci.c | 2 ++ grub-core/bus/usb/uhci.c | 2 ++ grub-core/bus/usb/usbhub.c | 19 +++++++++++++++++++ include/grub/usb.h | 4 ++++ 5 files changed, 29 insertions(+) diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c index d966fc210..6b3f2f87a 100644 --- a/grub-core/bus/usb/ehci.c +++ b/grub-core/bus/usb/ehci.c @@ -1812,6 +1812,8 @@ static struct grub_usb_controller_dev usb_controller = { .hubports = grub_ehci_hubports, .portstatus = grub_ehci_portstatus, .detect_dev = grub_ehci_detect_dev, + .attach_dev = NULL, + .detach_dev = NULL, /* estimated max. count of TDs for one bulk transfer */ .max_bulk_tds = GRUB_EHCI_N_TD * 3 / 4 }; diff --git a/grub-core/bus/usb/ohci.c b/grub-core/bus/usb/ohci.c index f0be533d4..44c7e94a9 100644 --- a/grub-core/bus/usb/ohci.c +++ b/grub-core/bus/usb/ohci.c @@ -1440,6 +1440,8 @@ static struct grub_usb_controller_dev usb_controller = .hubports = grub_ohci_hubports, .portstatus = grub_ohci_portstatus, .detect_dev = grub_ohci_detect_dev, + .attach_dev = NULL, + .detach_dev = NULL, /* estimated max. count of TDs for one bulk transfer */ .max_bulk_tds = GRUB_OHCI_TDS * 3 / 4 }; diff --git a/grub-core/bus/usb/uhci.c b/grub-core/bus/usb/uhci.c index 7c5811fd6..4143d24fe 100644 --- a/grub-core/bus/usb/uhci.c +++ b/grub-core/bus/usb/uhci.c @@ -845,6 +845,8 @@ static struct grub_usb_controller_dev usb_controller = .hubports = grub_uhci_hubports, .portstatus = grub_uhci_portstatus, .detect_dev = grub_uhci_detect_dev, + .attach_dev = NULL, + .detach_dev = NULL, /* estimated max. count of TDs for one bulk transfer */ .max_bulk_tds = N_TD * 3 / 4 }; diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c index 136bf6ee4..df1913aee 100644 --- a/grub-core/bus/usb/usbhub.c +++ b/grub-core/bus/usb/usbhub.c @@ -66,6 +66,15 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, dev->split_hubport = split_hubport; dev->split_hubaddr = split_hubaddr; + if (controller->dev->attach_dev) { + err = controller->dev->attach_dev (controller, dev); + if (err) + { + grub_free (dev); + return NULL; + } + } + err = grub_usb_device_initialize (dev); if (err) { @@ -405,6 +414,8 @@ static void detach_device (grub_usb_device_t dev) { unsigned i; + grub_usb_err_t err; + int k; if (!dev) return; @@ -425,6 +436,14 @@ detach_device (grub_usb_device_t dev) if (inter && inter->detach_hook) inter->detach_hook (dev, i, k); } + if (dev->controller.dev->detach_dev) { + err = dev->controller.dev->detach_dev (&dev->controller, dev); + if (err) + { + // XXX + } + } + grub_usb_devs[dev->addr] = 0; } diff --git a/include/grub/usb.h b/include/grub/usb.h index f65ac4f5d..5c5fb5ec4 100644 --- a/include/grub/usb.h +++ b/include/grub/usb.h @@ -122,6 +122,10 @@ struct grub_usb_controller_dev grub_usb_speed_t (*detect_dev) (grub_usb_controller_t dev, int port, int *changed); + grub_usb_err_t (*attach_dev) (grub_usb_controller_t ctrl, grub_usb_device_t dev); + + grub_usb_err_t (*detach_dev) (grub_usb_controller_t ctrl, grub_usb_device_t dev); + /* Per controller flag - port reset pending, don't do another reset */ grub_uint64_t pending_reset; -- 2.26.2