From patchwork Mon Dec 9 13:06:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13899726 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 E1DAA1ACEAA for ; Mon, 9 Dec 2024 13:07:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733749623; cv=none; b=Wp9h3tJwT5tfY25j7qFdRTCFJ7oYv7Ujym/oTET2h1+C/BhDvjPQbuRqd6iu00hVTAT0PmhC9k11rrzw49iSjIaaMvD6eHwbus8btTwceRbXQOUc1qneazZQzmBMLEff9uS1rwA/EYIloOeRdc3OE+9Ca3TR6z2SpDQ3uiGLDNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733749623; c=relaxed/simple; bh=MrbDrpIsvZ1dKVLDYervP0Vycy2eBw/58VpDKwA2pz0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ELb2nGOOYgBF1vGdTl6r0he/5tRr698eF3nS50QNXKTtDG53yUdZ6B3Nk/x6KFiik1KRtMVAqKRHsNmmkJ0QsM5Yk9WD1hJYidloRa6ObokVz2UzkBGu4VwpylLmCexWfEVQl+hpIzMDDaHMDXT2Jm+hRByxmiJsx1EYOh2e9gk= 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=jLqCwpra; arc=none smtp.client-ip=170.10.133.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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jLqCwpra" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1733749621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jVrHbQL/WtPUoVmg5iNOH6KPahEUlaDR0JYKoVLlaPE=; b=jLqCwpraqa0yoZT5WUgpvEB4xxJSR40GFnhLSds+m1mScHLbqrMGRMnhMVgJS9X7I7Ifhr MwirMGBI5z0LDbfGCGK6CgFRzvBXVRm6YCaJlCs1xLJRzIAsyXneP2lWtvl53r81/KYZaf lslcSaJXCuw+oBZFWprnUNAJAFCCWc4= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-552-C9CerEbZMeCgghRUMwQWTA-1; Mon, 09 Dec 2024 08:06:59 -0500 X-MC-Unique: C9CerEbZMeCgghRUMwQWTA-1 X-Mimecast-MFC-AGG-ID: C9CerEbZMeCgghRUMwQWTA Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-434ffe724d6so920635e9.1 for ; Mon, 09 Dec 2024 05:06:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733749615; x=1734354415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jVrHbQL/WtPUoVmg5iNOH6KPahEUlaDR0JYKoVLlaPE=; b=JsDevpeO8stDWnivhV6sd1wY9n/WLPcFVDthWNsm22JW/yV4h6UX5HIz137R9WpDE8 gCX+YLT6eCBIAqK2kJ6UWRFS9lks766mMWSUfXVFhmWETCM1x3fCvGKdoSbjEsSj7cxs lyqGGUlaKv0mvQlYBmr25SuCWZyNVpEd6s6chXR0jGBGzHjHnulu9iFn8fojMywKE6C0 eDHugBtvp3wVAtIJ1KA0+D44kONQje5GHcIoyi7z7ewn9Kus6s9W59D13St8pKDBLy3L 2EMis8QBZERYGLIsHrfbn9ZRH6anOA6C2O+FWNVzL7OfOZl5e5dD2OyeQuKN9A9GbTcd ZEXw== X-Forwarded-Encrypted: i=1; AJvYcCX8UjP5btxKa29shFF7SJyNiWivGZcmVgfI7/zopLiRFCFgqpKs9Jn9h/eU4SAZHyObYao=@vger.kernel.org X-Gm-Message-State: AOJu0Ywf6WVpIMsnLAsm8t46+RyAbZB9M3G9WzsV97dWeCxl9ubvSk5G yF1EMGriUxgWc1woVqtuZ/krDqWTf9aPmDdAWeaM5XydWKLjuBKtMefXGo571pCbXt+NbYL4EGs La9zRQxr1C7FAEGyJyGo/lfJJDNU4endYosXuEcEQU6CZXvwMug== X-Gm-Gg: ASbGncvgIYh6e6VBULqieMomBDNnchEd7YGLFHpz6QgY4MZBxyC4x73802PcH/4Etek AaY9VBB4wbZ5LZHt6iaUzoiY78iIhK4wV3kMCArmpfqyachhZY0ucl/3BJWSrr5ltf9HuJhXBRl K+BCe+wu06KJGOlvlpIAiZdPwAfKEFU9kTMMtDD467OzNvwMggZKSgwiuvigU/c45I32qi472qu s4rjsr7Zb6WSm5Bdw+X6XcJ9MnbBbKHm97XvD8zNW7sLrYDSzqMyoZ+V/x+2x9mqdzX1SQ5D4Dn Z6vkJVbc X-Received: by 2002:a05:600c:3544:b0:431:60ec:7a91 with SMTP id 5b1f17b1804b1-434ddeade70mr103095235e9.2.1733749615433; Mon, 09 Dec 2024 05:06:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8dWBtsXMwPpsQh4FEW+o80sVo3gsVutdK8rZwCICXTNWn24DfDXUekpZhDfdomYwt5/+rkA== X-Received: by 2002:a05:600c:3544:b0:431:60ec:7a91 with SMTP id 5b1f17b1804b1-434ddeade70mr103094435e9.2.1733749614932; Mon, 09 Dec 2024 05:06:54 -0800 (PST) Received: from eisenberg.redhat.com (nat-pool-muc-u.redhat.com. [149.14.88.27]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3862190965asm13200127f8f.82.2024.12.09.05.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 05:06:54 -0800 (PST) From: Philipp Stanner To: amien Le Moal , Niklas Cassel , Basavaraj Natikar , Jiri Kosina , Benjamin Tissoires , Arnd Bergmann , Greg Kroah-Hartman , Alex Dubov , Sudarsana Kalluru , Manish Chopra , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rasesh Mody , GR-Linux-NIC-Dev@marvell.com, Igor Mitsyanko , Sergey Matyukevich , Kalle Valo , Sanjay R Mehta , Shyam Sundar S K , Jon Mason , Dave Jiang , Allen Hubbe , Bjorn Helgaas , Alex Williamson , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Mario Limonciello , Chen Ni , Philipp Stanner , Ricky Wu , Al Viro , Breno Leitao , Thomas Gleixner , Kevin Tian , Andy Shevchenko , Mostafa Saleh , Jason Gunthorpe , Yi Liu , Kunwu Chan , Dan Carpenter , "Dr. David Alan Gilbert" , Ankit Agrawal , Reinette Chatre , Eric Auger , Ye Bin Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, ntb@lists.linux.dev, linux-pci@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [PATCH v3 04/11] net/ntb: Use never-managed version of pci_intx() Date: Mon, 9 Dec 2024 14:06:26 +0100 Message-ID: <20241209130632.132074-6-pstanner@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241209130632.132074-2-pstanner@redhat.com> References: <20241209130632.132074-2-pstanner@redhat.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 pci_intx() is a hybrid function which can sometimes be managed through devres. To remove this hybrid nature from pci_intx(), it is necessary to port users to either an always-managed or a never-managed version. hw/amd and how/intel enable their PCI-Device with pci_enable_device(). Thus, they need the never-managed version. Replace pci_intx() with pci_intx_unmanaged(). Signed-off-by: Philipp Stanner Acked-by: Shyam Sundar S K #for ntb_hw_amd.c Acked-by: Dave Jiang # for ntb_hw_gen1.c --- drivers/ntb/hw/amd/ntb_hw_amd.c | 4 ++-- drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c index d687e8c2cc78..b146f170e839 100644 --- a/drivers/ntb/hw/amd/ntb_hw_amd.c +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c @@ -791,7 +791,7 @@ static int ndev_init_isr(struct amd_ntb_dev *ndev, err_msi_enable: /* Try to set up intx irq */ - pci_intx(pdev, 1); + pci_intx_unmanaged(pdev, 1); rc = request_irq(pdev->irq, ndev_irq_isr, IRQF_SHARED, "ndev_irq_isr", ndev); @@ -831,7 +831,7 @@ static void ndev_deinit_isr(struct amd_ntb_dev *ndev) if (pci_dev_msi_enabled(pdev)) pci_disable_msi(pdev); else - pci_intx(pdev, 0); + pci_intx_unmanaged(pdev, 0); } } diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c index 079b8cd79785..9ad9d7fe227e 100644 --- a/drivers/ntb/hw/intel/ntb_hw_gen1.c +++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c @@ -445,7 +445,7 @@ int ndev_init_isr(struct intel_ntb_dev *ndev, /* Try to set up intx irq */ - pci_intx(pdev, 1); + pci_intx_unmanaged(pdev, 1); rc = request_irq(pdev->irq, ndev_irq_isr, IRQF_SHARED, "ndev_irq_isr", ndev);