Message ID | 20240206134000.23561-2-pstanner@redhat.com |
---|---|
Headers |
Return-Path: <linux-kernel+bounces-55030-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1543059dyb; Tue, 6 Feb 2024 05:40:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IFUnLL+4qyM1w0C2V08q2SvV2hXrEHexjrrY4Sy0uGL0/DaP0mgdM/nN7Xjh4O44pNrkPdl X-Received: by 2002:a05:620a:2b9a:b0:785:7871:352f with SMTP id dz26-20020a05620a2b9a00b007857871352fmr2941748qkb.41.1707226850070; Tue, 06 Feb 2024 05:40:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707226850; cv=pass; d=google.com; s=arc-20160816; b=YT2hrlVoMIcnxGyqWps9y9gEBOb2QV6jzlUrt/mmIUOX+KT3/1dJobRhPuWLvaSYSD zrlXDEl3bzq0bveXnaxi9wk1FlWR8Nhpt33EKTEK7o72LfhwT2ekfpMoYlFYx3Oz5a9x hBl2qQDOXWgWguSSuk96f8ubcxuuDjfkoLy+McPL5crhyfEclEQBSHi0u1k6hDfOdF1C HYAYbjSkZm8QPg6ENJIarn0+dv/M7OHAn/Kvk0VVtz19XJEC8R9tC4x+s+RQzEE0qFAp tEOICXKcmpdnbJaSr/fWPsAgRNl/xHUwdhP9V1GXTs9uVa4Py6gtXjqm/mEF8OL+KeV8 ugnw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=QpY62CAbzs1kZlSzF8o4OMEgSIRU4oj8654lX7CLtwY=; fh=9/vCVRL82TocUrCv8Epk9qaFqEn0R3RM931TKL0edYM=; b=qjNtQHIJx1mo9n0o+BilySG9yiQ+vmWHIutNsvk0Shdesb14nevWH9Dhs9/tGvqgfI mSMa+csX32vwHJmj6b1oTdGiz0HQI273PJCQ8dPt4o7B/PfOn0AXVYMFZxJmth7wZoDH 21TpKKYqFHLotqkji1eN3xHIPc/pAJJQ9IE4s2FWHvkqWUSF241F9811mClR4VFr+2Rm eD44YOAmRiQz5/f7tPvMRMUdvtARZHwZIcDCC+AZvWp62olKfc4wxJJExoif298hv8gT C6SsPlj5tsb7StnT8RjS4JMn3EN1chxdfITU7Q9aDThRi8XJxIP+TgaNMXDvinivY63Z qq6A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KCqvr9T2; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-55030-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55030-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=1; AJvYcCX2siI2wtcslIkHbj0c94mudVsUJ7Y1X+pjFijJAQ/GPgTMO52kbqqUynWoO9Wea9T7iyDSbaclLbhPTO4N3R5uTk1NHA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id 17-20020a05620a04d100b007855d88743dsi2176768qks.520.2024.02.06.05.40.49 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 05:40:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55030-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KCqvr9T2; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-55030-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55030-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id C94B51C23573 for <ouuuleilei@gmail.com>; Tue, 6 Feb 2024 13:40:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A8773131740; Tue, 6 Feb 2024 13:40:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KCqvr9T2" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 533DD1D556 for <linux-kernel@vger.kernel.org>; Tue, 6 Feb 2024 13:40:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707226832; cv=none; b=m0DGrELnvMP/BqFFT09oEYeejmxedhDf62XmZfri6XIXBtw3RMHPSQ8MBaee5wkbZxqOnL3ZG0h1sPOCa3KJ03vhGrdax+ScKefSOPgmBQUqUfnmbPrtoEO98qojvLgYSOtx371mqBYdkUHqoWKgiAJdgFmdnRwYCmGkhS2eXck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707226832; c=relaxed/simple; bh=hE2XT1hEKQxWX2w+Vz7cAy5o22Ieh0ZEONmnPlZ0Azw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=Yi6YN5/q19wiXdIlWFW7/ZSQ3jzzHV7k31IK5wcAiO3kw/NbnB2BVlWByD8f0XxH51RzTtLjy8qCbXhgZq6MYX5wE6u1OGu1mzCwh/TtV/BeHLVzHQOqE8L1tNlzDQesdqpsTcnRSRLWNk6rEovCIgCszYGFfEsci8kDHLaZ8Z8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=KCqvr9T2; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707226829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QpY62CAbzs1kZlSzF8o4OMEgSIRU4oj8654lX7CLtwY=; b=KCqvr9T255jbRjcl4l/JVl5kgZM+HNTMG5/NiYi0yLNiyXdp0BKoJHN7+kwXkzFe54JPmK t7y+w4D6yc5r2EMiPvke/cABptTNwoeO7/fNxifCYiO3Km1312UOrLyeNh1PbZrjPM5vMn 4yaUvn7EwHYRq41V5VdAa0rH+BccKMc= Received: from mail-oo1-f70.google.com (mail-oo1-f70.google.com [209.85.161.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-389-2Tjwb95jPGmd7AuX5BdqhQ-1; Tue, 06 Feb 2024 08:40:28 -0500 X-MC-Unique: 2Tjwb95jPGmd7AuX5BdqhQ-1 Received: by mail-oo1-f70.google.com with SMTP id 006d021491bc7-59a1817a5a8so382883eaf.1 for <linux-kernel@vger.kernel.org>; Tue, 06 Feb 2024 05:40:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707226827; x=1707831627; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QpY62CAbzs1kZlSzF8o4OMEgSIRU4oj8654lX7CLtwY=; b=KmLs887y+oAQgPfsi4oYCAjV/YIEXxRVe/Oub7zf3IE2cEETkEv/HUd5oDkxuL19vv rfIzZfkv1aa1zM1JNOkFd/54hocILqPFMF9lDyckvxdQFQjUrqRag125F799DIFfRiHg 6lvb2pZgtxc0g5TxyEWG+LzbWuN158+sV5dlf0pI/Wh0Ssd4pnSWIs14WRC0g9E+Akcd YFaKzblvj/DABNhtqX9xnqyn8Lnr8o8MDdlqSp+qLGdYhVJVnWAtOZpfLScK7qXVPFfn mUhFXSg+aNjc2wXg0zp7+zK2QmqBM6KE+w7LdrfRirmNvsdYozRjk55bYkB2R9eQufF5 i+pQ== X-Gm-Message-State: AOJu0YyoaGosiMSAcMCBT9Sq3nVwq0YubJAtuATHWKyEF/bugaOOZ6v3 5X+huf2XAaXqUTGHqhi7q1rYRa392Z22xwtyLhWR1eLXXlQCoRuZleLzcYvCnzx0CF7qnZEvytD 9gT8EZ3higgYbah/+CtkoTJYHqFmy9F898CuAfMCIgRO0bNNzThgo9iYARQUKHg== X-Received: by 2002:a4a:ce99:0:b0:59c:d8cd:ecee with SMTP id f25-20020a4ace99000000b0059cd8cdeceemr2888542oos.1.1707226827510; Tue, 06 Feb 2024 05:40:27 -0800 (PST) X-Received: by 2002:a4a:ce99:0:b0:59c:d8cd:ecee with SMTP id f25-20020a4ace99000000b0059cd8cdeceemr2888514oos.1.1707226827219; Tue, 06 Feb 2024 05:40:27 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUIM1d7cKsnx6ZBJxdCTNBxX2IVrCI36r3smohJVNNMP6NIN7DryE10Ug4aKiENWtwcqhfhIcWl7RQQffJaLibEgC6l534MQFXFEaGQ1fuSx/MEW0HKeF+rKJ8FwYo7nr0latl9rdDhIb8VfxNVOLKr1MpxJTOuQRs2QuH1z9ycoLqulqFfFGFauS6o8gmDcpIk4v2qvzBYZ6oW8hBR/wNOpixarPC28/cf9aUFfTIkR2K34LpUjW0MIWDaFWIkKxW+3mBkAQ69eeo6X6N1Muoye96s3+6fbTrfEo31aHZ8AELlFcDrEhOQpXlwP4rPRztEhDBtVxwKaPc2BYXFolrofZUKCzNSBA8mRAF2fKKuUOFJExCdLYFVyGK1JyLqF6/uCn79 Received: from pstanner-thinkpadt14sgen1.remote.csb (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id vu4-20020a05620a560400b0078544c8be9asm903791qkn.87.2024.02.06.05.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 05:40:26 -0800 (PST) From: Philipp Stanner <pstanner@redhat.com> To: Hans de Goede <hdegoede@redhat.com>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Bjorn Helgaas <bhelgaas@google.com>, Sam Ravnborg <sam@ravnborg.org>, dakr@redhat.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Philipp Stanner <pstanner@redhat.com> Subject: [PATCH v3 00/10] Make PCI's devres API more consistent Date: Tue, 6 Feb 2024 14:39:46 +0100 Message-ID: <20240206134000.23561-2-pstanner@redhat.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790157101727826860 X-GMAIL-MSGID: 1790157101727826860 |
Series |
Make PCI's devres API more consistent
|
|
Message
Philipp Stanner
Feb. 6, 2024, 1:39 p.m. UTC
Changes in v3: - Use the term "PCI devres API" in some forgotten places. - Fix more grammar errors in patch #3. - Remove the comment advising to call (the outdated) pcim_intx() in pci.c - Rename __pcim_request_region_range() flags-field "exclusive" to "req_flags", since this is what the int actually represents. - Remove the call to pcim_region_request() from patch #10. (Hans) Changes in v2: - Make commit head lines congruent with PCI's style (Bjorn) - Add missing error checks for devm_add_action(). (Andy) - Repair the "Returns: " marks for docu generation (Andy) - Initialize the addr_devres struct with memset(). (Andy) - Make pcim_intx() a PCI-internal function so that new drivers won't be encouraged to use the outdated pci_intx() mechanism. (Andy / Philipp) - Fix grammar and spelling (Bjorn) - Be more precise on why pcim_iomap_table() is problematic (Bjorn) - Provide the actual structs' and functions' names in the commit messages (Bjorn) - Remove redundant variable initializers (Andy) - Regroup PM bitfield members in struct pci_dev (Andy) - Make pcim_intx() visible only for the PCI subsystem so that new drivers won't use this outdated API (Andy, Myself) - Add a NOTE to pcim_iomap() to warn about this function being the onee xception that does just return NULL. - Consistently use the term "PCI devres API"; also in Patch #10 (Bjorn) ¡Hola! PCI's devres API suffers several weaknesses: 1. There are functions prefixed with pcim_. Those are always managed counterparts to never-managed functions prefixed with pci_ – or so one would like to think. There are some apparently unmanaged functions (all region-request / release functions, and pci_intx()) which suddenly become managed once the user has initialized the device with pcim_enable_device() instead of pci_enable_device(). This "sometimes yes, sometimes no" nature of those functions is confusing and therefore bug-provoking. In fact, it has already caused a bug in DRM. The last patch in this series fixes that bug. 2. iomappings: Instead of giving each mapping its own callback, the existing API uses a statically allocated struct tracking one mapping per bar. This is not extensible. Especially, you can't create _ranged_ managed mappings that way, which many drivers want. 3. Managed request functions only exist as "plural versions" with a bit-mask as a parameter. That's quite over-engineered considering that each user only ever mapps one, maybe two bars. This series: - add a set of new "singular" devres functions that use devres the way its intended, with one callback per resource. - deprecates the existing iomap-table mechanism. - deprecates the hybrid nature of pci_ functions. - preserves backwards compatibility so that drivers using the existing API won't notice any changes. - adds documentation, especially some warning users about the complicated nature of PCI's devres. Note that this series is based on my "unify pci_iounmap"-series from a few weeks ago. [1] I tested this on a x86 VM with a simple pci test-device with two regions. Operates and reserves resources as intended on my system. Kasan and kmemleak didn't find any problems. I believe this series cleans the API up as much as possible without having to port all existing drivers to the new API. Especially, I think that this implementation is easy to extend if the need for new managed functions arises :) Greetings, P. Philipp Stanner (10): PCI: Add new set of devres functions PCI: Deprecate iomap-table functions PCI: Warn users about complicated devres nature PCI: Make devres region requests consistent PCI: Move dev-enabled status bit to struct pci_dev PCI: Move pinned status bit to struct pci_dev PCI: Give pcim_set_mwi() its own devres callback PCI: Give pci(m)_intx its own devres callback PCI: Remove legacy pcim_release() drm/vboxvideo: fix mapping leaks drivers/gpu/drm/vboxvideo/vbox_main.c | 20 +- drivers/pci/devres.c | 1015 +++++++++++++++++++++---- drivers/pci/iomap.c | 18 + drivers/pci/pci.c | 123 ++- drivers/pci/pci.h | 25 +- include/linux/pci.h | 18 +- 6 files changed, 1004 insertions(+), 215 deletions(-)
Comments
@Bjorn: Hey Bjorn, are we good with this series? Any more wishes or suggestions? P. On Tue, 2024-02-06 at 14:39 +0100, Philipp Stanner wrote: > Changes in v3: > - Use the term "PCI devres API" in some forgotten places. > - Fix more grammar errors in patch #3. > - Remove the comment advising to call (the outdated) pcim_intx() in > pci.c > - Rename __pcim_request_region_range() flags-field "exclusive" to > "req_flags", since this is what the int actually represents. > - Remove the call to pcim_region_request() from patch #10. (Hans) > > Changes in v2: > - Make commit head lines congruent with PCI's style (Bjorn) > - Add missing error checks for devm_add_action(). (Andy) > - Repair the "Returns: " marks for docu generation (Andy) > - Initialize the addr_devres struct with memset(). (Andy) > - Make pcim_intx() a PCI-internal function so that new drivers > won't > be encouraged to use the outdated pci_intx() mechanism. > (Andy / Philipp) > - Fix grammar and spelling (Bjorn) > - Be more precise on why pcim_iomap_table() is problematic (Bjorn) > - Provide the actual structs' and functions' names in the commit > messages (Bjorn) > - Remove redundant variable initializers (Andy) > - Regroup PM bitfield members in struct pci_dev (Andy) > - Make pcim_intx() visible only for the PCI subsystem so that > new > drivers won't use this outdated API (Andy, Myself) > - Add a NOTE to pcim_iomap() to warn about this function being > the onee > xception that does just return NULL. > - Consistently use the term "PCI devres API"; also in Patch #10 > (Bjorn) > > > ¡Hola! > > PCI's devres API suffers several weaknesses: > > 1. There are functions prefixed with pcim_. Those are always managed > counterparts to never-managed functions prefixed with pci_ – or so > one > would like to think. There are some apparently unmanaged functions > (all region-request / release functions, and pci_intx()) which > suddenly become managed once the user has initialized the device > with > pcim_enable_device() instead of pci_enable_device(). This > "sometimes > yes, sometimes no" nature of those functions is confusing and > therefore bug-provoking. In fact, it has already caused a bug in > DRM. > The last patch in this series fixes that bug. > 2. iomappings: Instead of giving each mapping its own callback, the > existing API uses a statically allocated struct tracking one > mapping > per bar. This is not extensible. Especially, you can't create > _ranged_ managed mappings that way, which many drivers want. > 3. Managed request functions only exist as "plural versions" with a > bit-mask as a parameter. That's quite over-engineered considering > that each user only ever mapps one, maybe two bars. > > This series: > - add a set of new "singular" devres functions that use devres the > way > its intended, with one callback per resource. > - deprecates the existing iomap-table mechanism. > - deprecates the hybrid nature of pci_ functions. > - preserves backwards compatibility so that drivers using the > existing > API won't notice any changes. > - adds documentation, especially some warning users about the > complicated nature of PCI's devres. > > > Note that this series is based on my "unify pci_iounmap"-series from > a > few weeks ago. [1] > > I tested this on a x86 VM with a simple pci test-device with two > regions. Operates and reserves resources as intended on my system. > Kasan and kmemleak didn't find any problems. > > I believe this series cleans the API up as much as possible without > having to port all existing drivers to the new API. Especially, I > think > that this implementation is easy to extend if the need for new > managed > functions arises :) > > Greetings, > P. > > Philipp Stanner (10): > PCI: Add new set of devres functions > PCI: Deprecate iomap-table functions > PCI: Warn users about complicated devres nature > PCI: Make devres region requests consistent > PCI: Move dev-enabled status bit to struct pci_dev > PCI: Move pinned status bit to struct pci_dev > PCI: Give pcim_set_mwi() its own devres callback > PCI: Give pci(m)_intx its own devres callback > PCI: Remove legacy pcim_release() > drm/vboxvideo: fix mapping leaks > > drivers/gpu/drm/vboxvideo/vbox_main.c | 20 +- > drivers/pci/devres.c | 1015 +++++++++++++++++++++-- > -- > drivers/pci/iomap.c | 18 + > drivers/pci/pci.c | 123 ++- > drivers/pci/pci.h | 25 +- > include/linux/pci.h | 18 +- > 6 files changed, 1004 insertions(+), 215 deletions(-) >
On Thu, Feb 29, 2024 at 09:31:20AM +0100, Philipp Stanner wrote: > @Bjorn: > Hey Bjorn, are we good with this series? Any more wishes or > suggestions? Sorry, haven't had a chance to go through it yet. FWIW, I just tried to apply these on top of pci/devres, but it failed here: Applying: PCI: Add new set of devres functions Applying: PCI: Deprecate iomap-table functions Applying: PCI: Warn users about complicated devres nature Applying: PCI: Make devres region requests consistent Applying: PCI: Move dev-enabled status bit to struct pci_dev error: patch failed: drivers/pci/pci.h:811 error: drivers/pci/pci.h: patch does not apply Patch failed at 0005 PCI: Move dev-enabled status bit to struct pci_dev Haven't investigated, so maybe it's some trivial easily fixed thing. Bjorn
On Thu, 2024-02-29 at 14:57 -0600, Bjorn Helgaas wrote: > On Thu, Feb 29, 2024 at 09:31:20AM +0100, Philipp Stanner wrote: > > @Bjorn: > > Hey Bjorn, are we good with this series? Any more wishes or > > suggestions? > > Sorry, haven't had a chance to go through it yet. > > FWIW, I just tried to apply these on top of pci/devres, but it failed > here: > > Applying: PCI: Add new set of devres functions > Applying: PCI: Deprecate iomap-table functions > Applying: PCI: Warn users about complicated devres nature > Applying: PCI: Make devres region requests consistent > Applying: PCI: Move dev-enabled status bit to struct pci_dev > error: patch failed: drivers/pci/pci.h:811 > error: drivers/pci/pci.h: patch does not apply > Patch failed at 0005 PCI: Move dev-enabled status bit to struct > pci_dev > > Haven't investigated, so maybe it's some trivial easily fixed thing. For me, based on Linus's master, this applies with the previous series. It seems to me that this issue only exists on linux-next, the reason being that git searches for struct pci_devres in line 811, but on linux-next, because of previous additions, the struct moved to line 827, and poor git can't find it anymore. I could fix that and provide a v4. P. > > Bjorn >