{"id":958764,"url":"http://patchwork.ozlabs.org/api/patches/958764/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20180817102645.3839621-13-arnd@arndb.de/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<20180817102645.3839621-13-arnd@arndb.de>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20180817102645.3839621-13-arnd@arndb.de/","date":"2018-08-17T10:26:42","name":"[RFC,12/15] PCI: make pcibios_bus_add_device() a callback function","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"636063dd205a829255c1f7bbd213a60d8152371c","submitter":{"id":30,"url":"http://patchwork.ozlabs.org/api/people/30/?format=json","name":"Arnd Bergmann","email":"arnd@arndb.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20180817102645.3839621-13-arnd@arndb.de/mbox/","series":[{"id":61229,"url":"http://patchwork.ozlabs.org/api/series/61229/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=61229","date":"2018-08-17T10:26:32","name":"PCI: turn some __weak functions into callbacks","version":1,"mbox":"http://patchwork.ozlabs.org/series/61229/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/958764/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/958764/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41sKsy5v4hz9s5b\n\tfor ;\n\tFri, 17 Aug 2018 20:57:42 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 41sKsy47nYzDrcW\n\tfor ;\n\tFri, 17 Aug 2018 20:57:42 +1000 (AEST)","from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 41sKKY2mfpzF0gv\n\tfor ;\n\tFri, 17 Aug 2018 20:33:05 +1000 (AEST)","from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de\n\t(mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id\n\t0MC1IG-1fhmHo0FzU-008rTJ; Fri, 17 Aug 2018 12:27:20 +0200"],"Authentication-Results":["ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=arndb.de","lists.ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=arndb.de","lists.ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=arndb.de\n\t(client-ip=212.227.17.24; helo=mout.kundenserver.de;\n\tenvelope-from=arnd@arndb.de; receiver=)","lists.ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=arndb.de"],"From":"Arnd Bergmann ","To":"linux-pci@vger.kernel.org,\n\tBjorn Helgaas ","Subject":"[RFC 12/15] PCI: make pcibios_bus_add_device() a callback function","Date":"Fri, 17 Aug 2018 12:26:42 +0200","Message-Id":"<20180817102645.3839621-13-arnd@arndb.de>","X-Mailer":"git-send-email 2.18.0","In-Reply-To":"<20180817102645.3839621-1-arnd@arndb.de>","References":"<20180817102645.3839621-1-arnd@arndb.de>","X-Provags-ID":"V03:K1:R1utoXtX1xNh6nDBCTDKYtshx4x5Ad5wYNBJAgXrFk787hWLNDF\n\t5obZ97/w/5En0hskq/pxyK7SOPl4UhPJ2PTwKnGPNKAKwSSdQ44BRgnjAIpA6XYIYn0Er06\n\tPc2dX6A+UrbraMGwdzGaTIO5CmmDZNbHiidjXfSMXOaA8lWZRiNZ9X5Rk7imkL9cOwKt3Sk\n\tD03IBJSMeL9atj01F6mqA==","X-UI-Out-Filterresults":"notjunk:1; V01:K0:JT18v2PmRjM=:BdxvTLBWgjFTWFz/lix40r\n\t9z4L3bxqOuksALVAYcFPcGpBAZuHvxmXREciCWT0V4/KjIXU7sz10GNs3qu0muAS692Y4EBws\n\ty+uS8NypHKJkVoSyknYHDj1g11Iu4pvyZqQYI6ncINrrbegVAxG9Z+B3fpehQ7XQOKhdqeYkn\n\tjn3FweKwwFL+VeWCuHooBR7iSTg86FYe7UYVuNIw5MzmMWP3fX9BHR2ImBsD+mQfCvMjNg5lF\n\tgGbPHgrRtwSX+GTsRnmZVzCHwjuW5FgQtJ8OJ0QOtzQ93iopjmt78mviBj+iy0/Y0c9zY01PE\n\tjIkdyyGlOlaAhDElnwPn/yIojydgF/B8h/nAR6j+GbGIzTCmqSoIU64UfKheX8l45C/L0s+kK\n\ttCfFlZnlqOEWD/N36yRWCRohnxPcXEz1piMQO5lTC9i0wZbK/w8I/gFKm4egVgjhOzRfGYfPb\n\txya+oG5EXfKiYxkCNUzEV5IsLsyW1Rb9owa3hrXKHagKNI+G0FyPcgX7Up6LGKBPx7T0loImS\n\tfGoU7kHZoFm/i7EI1ePh4pUDtxXzxvXaNn7DnHhXsF/qaRs5lobIrV9LxKk7gBUXjKjucaa/m\n\tiUnGqaHijQc0KiZ88rSKl8sMm9gwqe/QqHLWHtQpay9Mm8L4VOy1CNddVxFlNINETjzZChzIB\n\t0z50LSuBb/sqfq6Q+iqBd0aXbZIliRA0Y5RL3HF0K3GjQGCz70DsvRVRuiObKuhVfw2g=","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.27","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Lorenzo Pieralisi ,\n\tArnd Bergmann , linux-kernel@vger.kernel.org,\n\tChristoph Hellwig , linux-acpi@vger.kernel.org,\n\tlinuxppc-dev@lists.ozlabs.org","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"Weak functions are confusion, and we can now add callback pointers\nto pci host bridges for any controller, so let's make this one\na callback rather than a __weak global function.\n\nSigned-off-by: Arnd Bergmann \n---\n arch/powerpc/kernel/pci-common.c | 7 +------\n arch/sh/drivers/pci/pci.c | 1 +\n arch/sh/drivers/pci/pcie-sh7786.c | 3 ++-\n arch/sh/include/asm/pci.h | 2 ++\n drivers/pci/bus.c | 8 +++++++-\n include/linux/pci.h | 2 +-\n 6 files changed, 14 insertions(+), 9 deletions(-)","diff":"diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c\nindex 096011ec8670..afc9598e4349 100644\n--- a/arch/powerpc/kernel/pci-common.c\n+++ b/arch/powerpc/kernel/pci-common.c\n@@ -270,12 +270,6 @@ int pcibios_sriov_disable(struct pci_dev *pdev)\n \n #endif /* CONFIG_PCI_IOV */\n \n-void pcibios_bus_add_device(struct pci_dev *pdev)\n-{\n-\tif (ppc_md.pcibios_bus_add_device)\n-\t\tppc_md.pcibios_bus_add_device(pdev);\n-}\n-\n static resource_size_t pcibios_io_size(const struct pci_controller *hose)\n {\n #ifdef CONFIG_PPC64\n@@ -1617,6 +1611,7 @@ void pcibios_scan_phb(struct pci_controller *hose)\n \those->busn.flags = IORESOURCE_BUS;\n \tpci_add_resource(&bridge->windows, &hose->busn);\n \n+\tbridge->bus_add_device = ppc_md->pcibios_bus_add_device;\n \tbridge->dev.parent = hose->parent;\n \tbridge->sysdata = hose;\n \tbridge->busnr = hose->first_busno;\ndiff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c\nindex 8256626bc53c..d5c01a86cde1 100644\n--- a/arch/sh/drivers/pci/pci.c\n+++ b/arch/sh/drivers/pci/pci.c\n@@ -65,6 +65,7 @@ static void pcibios_scanbus(struct pci_channel *hose)\n \tbridge->ops = hose->pci_ops;\n \tbridge->swizzle_irq = pci_common_swizzle;\n \tbridge->map_irq = pcibios_map_platform_irq;\n+\tbridge->bus_add_device = hose->bus_add_device;\n \n \tret = pci_scan_root_bus_bridge(bridge);\n \tif (ret) {\ndiff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c\nindex 3d81a8b80942..ab78356681a0 100644\n--- a/arch/sh/drivers/pci/pcie-sh7786.c\n+++ b/arch/sh/drivers/pci/pcie-sh7786.c\n@@ -122,6 +122,7 @@ extern struct pci_ops sh7786_pci_ops;\n \t.reg_base\t= start,\t\t\t\t\t\\\n \t.mem_offset\t= 0,\t\t\t\t\t\t\\\n \t.io_offset\t= 0,\t\t\t\t\t\t\\\n+\t.bus_add_device = sh7786_pci_bus_add_device,\t\t\t\\\n }\n \n static struct pci_channel sh7786_pci_channels[] = {\n@@ -488,7 +489,7 @@ int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)\n return evt2irq(0xae0);\n }\n \n-void pcibios_bus_add_device(struct pci_dev *pdev)\n+static void sh7786_pci_bus_add_device(struct pci_dev *pdev)\n {\n \tpdev->dev.dma_pfn_offset = dma_pfn_offset;\n }\ndiff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h\nindex 10a36b1cf2ea..e605141cbcbe 100644\n--- a/arch/sh/include/asm/pci.h\n+++ b/arch/sh/include/asm/pci.h\n@@ -35,6 +35,8 @@ struct pci_channel {\n \t/* Optional error handling */\n \tstruct timer_list\terr_timer, serr_timer;\n \tunsigned int\t\terr_irq, serr_irq;\n+\n+\tvoid (*bus_add_device)(struct pci_dev *pdev);\n };\n \n /* arch/sh/drivers/pci/pci.c */\ndiff --git a/drivers/pci/bus.c b/drivers/pci/bus.c\nindex 5cb40b2518f9..45873ac1a49c 100644\n--- a/drivers/pci/bus.c\n+++ b/drivers/pci/bus.c\n@@ -299,7 +299,13 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx)\n \n void __weak pcibios_resource_survey_bus(struct pci_bus *bus) { }\n \n-void __weak pcibios_bus_add_device(struct pci_dev *pdev) { }\n+static void pcibios_bus_add_device(struct pci_dev *pdev)\n+{\n+\tstruct pci_host_bridge *bridge = pci_find_host_bridge(pdev->bus);\n+\n+\tif (bridge->bus_add_device)\n+\t\tbridge->bus_add_device(pdev);\n+}\n \n /**\n * pci_bus_add_device - start driver for a single device\ndiff --git a/include/linux/pci.h b/include/linux/pci.h\nindex 1dd8a3ecf753..d1072690cb4f 100644\n--- a/include/linux/pci.h\n+++ b/include/linux/pci.h\n@@ -475,6 +475,7 @@ struct pci_host_bridge {\n \tu8 (*swizzle_irq)(struct pci_dev *, u8 *); /* Platform IRQ swizzler */\n \tint (*map_irq)(const struct pci_dev *, u8, u8);\n \tvoid (*release_fn)(struct pci_host_bridge *);\n+\tvoid (*bus_add_device)(struct pci_dev *pdev);\n \tvoid\t\t*release_data;\n \tstruct msi_controller *msi;\n \tunsigned int\tignore_reset_delay:1;\t/* For entire hierarchy */\n@@ -880,7 +881,6 @@ extern struct list_head pci_root_buses;\t/* List of all known PCI buses */\n int no_pci_devices(void);\n \n void pcibios_resource_survey_bus(struct pci_bus *bus);\n-void pcibios_bus_add_device(struct pci_dev *pdev);\n void pcibios_add_bus(struct pci_bus *bus);\n void pcibios_remove_bus(struct pci_bus *bus);\n void pcibios_fixup_bus(struct pci_bus *);\n","prefixes":["RFC","12/15"]}