From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 20 Apr 2018 13:42:14 -0500 From: Bjorn Helgaas To: Christoph Hellwig Cc: Konrad Rzeszutek Wilk , iommu@lists.linux-foundation.org, x86@kernel.org, linux-block@vger.kernel.org, linux-pci@vger.kernel.org, linux-mm@kvack.org, linux-ide@vger.kernel.org, linux-mips@linux-mips.org, sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 09/12] PCI: remove CONFIG_PCI_BUS_ADDR_T_64BIT Message-ID: <20180420184214.GT28657@bhelgaas-glaptop.roam.corp.google.com> References: <20180415145947.1248-1-hch@lst.de> <20180415145947.1248-10-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20180415145947.1248-10-hch@lst.de> Sender: linux-ide-owner@vger.kernel.org List-ID: On Sun, Apr 15, 2018 at 04:59:44PM +0200, Christoph Hellwig wrote: > This symbol is now always identical to CONFIG_ARCH_DMA_ADDR_T_64BIT, so > remove it. > > Signed-off-by: Christoph Hellwig Acked-by: Bjorn Helgaas Please merge this along with the rest of the series; let me know if you need anything more from me. > --- > drivers/pci/Kconfig | 4 ---- > drivers/pci/bus.c | 4 ++-- > include/linux/pci.h | 2 +- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig > index 34b56a8f8480..29a487f31dae 100644 > --- a/drivers/pci/Kconfig > +++ b/drivers/pci/Kconfig > @@ -5,10 +5,6 @@ > > source "drivers/pci/pcie/Kconfig" > > -config PCI_BUS_ADDR_T_64BIT > - def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT) > - depends on PCI > - > config PCI_MSI > bool "Message Signaled Interrupts (MSI and MSI-X)" > depends on PCI > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c > index bc2ded4c451f..35b7fc87eac5 100644 > --- a/drivers/pci/bus.c > +++ b/drivers/pci/bus.c > @@ -120,7 +120,7 @@ int devm_request_pci_bus_resources(struct device *dev, > EXPORT_SYMBOL_GPL(devm_request_pci_bus_resources); > > static struct pci_bus_region pci_32_bit = {0, 0xffffffffULL}; > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > static struct pci_bus_region pci_64_bit = {0, > (pci_bus_addr_t) 0xffffffffffffffffULL}; > static struct pci_bus_region pci_high = {(pci_bus_addr_t) 0x100000000ULL, > @@ -230,7 +230,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, > resource_size_t), > void *alignf_data) > { > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > int rc; > > if (res->flags & IORESOURCE_MEM_64) { > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 73178a2fcee0..55371cb827ad 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -670,7 +670,7 @@ int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, > int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn, > int reg, int len, u32 val); > > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > typedef u64 pci_bus_addr_t; > #else > typedef u32 pci_bus_addr_t; > -- > 2.17.0 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: Re: [PATCH 09/12] PCI: remove CONFIG_PCI_BUS_ADDR_T_64BIT Date: Fri, 20 Apr 2018 13:42:14 -0500 Message-ID: <20180420184214.GT28657@bhelgaas-glaptop.roam.corp.google.com> References: <20180415145947.1248-1-hch@lst.de> <20180415145947.1248-10-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20180415145947.1248-10-hch-jcswGhMUV9g@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Christoph Hellwig Cc: linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org, Konrad Rzeszutek Wilk , linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-block-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-ide@vger.kernel.org On Sun, Apr 15, 2018 at 04:59:44PM +0200, Christoph Hellwig wrote: > This symbol is now always identical to CONFIG_ARCH_DMA_ADDR_T_64BIT, so > remove it. > > Signed-off-by: Christoph Hellwig Acked-by: Bjorn Helgaas Please merge this along with the rest of the series; let me know if you need anything more from me. > --- > drivers/pci/Kconfig | 4 ---- > drivers/pci/bus.c | 4 ++-- > include/linux/pci.h | 2 +- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig > index 34b56a8f8480..29a487f31dae 100644 > --- a/drivers/pci/Kconfig > +++ b/drivers/pci/Kconfig > @@ -5,10 +5,6 @@ > > source "drivers/pci/pcie/Kconfig" > > -config PCI_BUS_ADDR_T_64BIT > - def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT) > - depends on PCI > - > config PCI_MSI > bool "Message Signaled Interrupts (MSI and MSI-X)" > depends on PCI > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c > index bc2ded4c451f..35b7fc87eac5 100644 > --- a/drivers/pci/bus.c > +++ b/drivers/pci/bus.c > @@ -120,7 +120,7 @@ int devm_request_pci_bus_resources(struct device *dev, > EXPORT_SYMBOL_GPL(devm_request_pci_bus_resources); > > static struct pci_bus_region pci_32_bit = {0, 0xffffffffULL}; > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > static struct pci_bus_region pci_64_bit = {0, > (pci_bus_addr_t) 0xffffffffffffffffULL}; > static struct pci_bus_region pci_high = {(pci_bus_addr_t) 0x100000000ULL, > @@ -230,7 +230,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, > resource_size_t), > void *alignf_data) > { > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > int rc; > > if (res->flags & IORESOURCE_MEM_64) { > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 73178a2fcee0..55371cb827ad 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -670,7 +670,7 @@ int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, > int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn, > int reg, int len, u32 val); > > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > typedef u64 pci_bus_addr_t; > #else > typedef u32 pci_bus_addr_t; > -- > 2.17.0 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: Date: Fri, 20 Apr 2018 13:42:14 -0500 From: Bjorn Helgaas To: Christoph Hellwig Subject: Re: [PATCH 09/12] PCI: remove CONFIG_PCI_BUS_ADDR_T_64BIT Message-ID: <20180420184214.GT28657@bhelgaas-glaptop.roam.corp.google.com> References: <20180415145947.1248-1-hch@lst.de> <20180415145947.1248-10-hch@lst.de> MIME-Version: 1.0 In-Reply-To: <20180415145947.1248-10-hch@lst.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-ide@vger.kernel.org, linux-mips@linux-mips.org, Konrad Rzeszutek Wilk , linux-pci@vger.kernel.org, x86@kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org, sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+bjorn=helgaas.com@lists.infradead.org List-ID: On Sun, Apr 15, 2018 at 04:59:44PM +0200, Christoph Hellwig wrote: > This symbol is now always identical to CONFIG_ARCH_DMA_ADDR_T_64BIT, so > remove it. > > Signed-off-by: Christoph Hellwig Acked-by: Bjorn Helgaas Please merge this along with the rest of the series; let me know if you need anything more from me. > --- > drivers/pci/Kconfig | 4 ---- > drivers/pci/bus.c | 4 ++-- > include/linux/pci.h | 2 +- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig > index 34b56a8f8480..29a487f31dae 100644 > --- a/drivers/pci/Kconfig > +++ b/drivers/pci/Kconfig > @@ -5,10 +5,6 @@ > > source "drivers/pci/pcie/Kconfig" > > -config PCI_BUS_ADDR_T_64BIT > - def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT) > - depends on PCI > - > config PCI_MSI > bool "Message Signaled Interrupts (MSI and MSI-X)" > depends on PCI > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c > index bc2ded4c451f..35b7fc87eac5 100644 > --- a/drivers/pci/bus.c > +++ b/drivers/pci/bus.c > @@ -120,7 +120,7 @@ int devm_request_pci_bus_resources(struct device *dev, > EXPORT_SYMBOL_GPL(devm_request_pci_bus_resources); > > static struct pci_bus_region pci_32_bit = {0, 0xffffffffULL}; > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > static struct pci_bus_region pci_64_bit = {0, > (pci_bus_addr_t) 0xffffffffffffffffULL}; > static struct pci_bus_region pci_high = {(pci_bus_addr_t) 0x100000000ULL, > @@ -230,7 +230,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, > resource_size_t), > void *alignf_data) > { > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > int rc; > > if (res->flags & IORESOURCE_MEM_64) { > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 73178a2fcee0..55371cb827ad 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -670,7 +670,7 @@ int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, > int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn, > int reg, int len, u32 val); > > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > typedef u64 pci_bus_addr_t; > #else > typedef u32 pci_bus_addr_t; > -- > 2.17.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Date: Fri, 20 Apr 2018 18:42:14 +0000 Subject: Re: [PATCH 09/12] PCI: remove CONFIG_PCI_BUS_ADDR_T_64BIT Message-Id: <20180420184214.GT28657@bhelgaas-glaptop.roam.corp.google.com> List-Id: References: <20180415145947.1248-1-hch@lst.de> <20180415145947.1248-10-hch@lst.de> In-Reply-To: <20180415145947.1248-10-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org On Sun, Apr 15, 2018 at 04:59:44PM +0200, Christoph Hellwig wrote: > This symbol is now always identical to CONFIG_ARCH_DMA_ADDR_T_64BIT, so > remove it. > > Signed-off-by: Christoph Hellwig Acked-by: Bjorn Helgaas Please merge this along with the rest of the series; let me know if you need anything more from me. > --- > drivers/pci/Kconfig | 4 ---- > drivers/pci/bus.c | 4 ++-- > include/linux/pci.h | 2 +- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig > index 34b56a8f8480..29a487f31dae 100644 > --- a/drivers/pci/Kconfig > +++ b/drivers/pci/Kconfig > @@ -5,10 +5,6 @@ > > source "drivers/pci/pcie/Kconfig" > > -config PCI_BUS_ADDR_T_64BIT > - def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT) > - depends on PCI > - > config PCI_MSI > bool "Message Signaled Interrupts (MSI and MSI-X)" > depends on PCI > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c > index bc2ded4c451f..35b7fc87eac5 100644 > --- a/drivers/pci/bus.c > +++ b/drivers/pci/bus.c > @@ -120,7 +120,7 @@ int devm_request_pci_bus_resources(struct device *dev, > EXPORT_SYMBOL_GPL(devm_request_pci_bus_resources); > > static struct pci_bus_region pci_32_bit = {0, 0xffffffffULL}; > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > static struct pci_bus_region pci_64_bit = {0, > (pci_bus_addr_t) 0xffffffffffffffffULL}; > static struct pci_bus_region pci_high = {(pci_bus_addr_t) 0x100000000ULL, > @@ -230,7 +230,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, > resource_size_t), > void *alignf_data) > { > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > int rc; > > if (res->flags & IORESOURCE_MEM_64) { > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 73178a2fcee0..55371cb827ad 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -670,7 +670,7 @@ int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, > int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn, > int reg, int len, u32 val); > > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > typedef u64 pci_bus_addr_t; > #else > typedef u32 pci_bus_addr_t; > -- > 2.17.0 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: helgaas@kernel.org (Bjorn Helgaas) Date: Fri, 20 Apr 2018 13:42:14 -0500 Subject: [PATCH 09/12] PCI: remove CONFIG_PCI_BUS_ADDR_T_64BIT In-Reply-To: <20180415145947.1248-10-hch@lst.de> References: <20180415145947.1248-1-hch@lst.de> <20180415145947.1248-10-hch@lst.de> Message-ID: <20180420184214.GT28657@bhelgaas-glaptop.roam.corp.google.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sun, Apr 15, 2018 at 04:59:44PM +0200, Christoph Hellwig wrote: > This symbol is now always identical to CONFIG_ARCH_DMA_ADDR_T_64BIT, so > remove it. > > Signed-off-by: Christoph Hellwig Acked-by: Bjorn Helgaas Please merge this along with the rest of the series; let me know if you need anything more from me. > --- > drivers/pci/Kconfig | 4 ---- > drivers/pci/bus.c | 4 ++-- > include/linux/pci.h | 2 +- > 3 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig > index 34b56a8f8480..29a487f31dae 100644 > --- a/drivers/pci/Kconfig > +++ b/drivers/pci/Kconfig > @@ -5,10 +5,6 @@ > > source "drivers/pci/pcie/Kconfig" > > -config PCI_BUS_ADDR_T_64BIT > - def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT) > - depends on PCI > - > config PCI_MSI > bool "Message Signaled Interrupts (MSI and MSI-X)" > depends on PCI > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c > index bc2ded4c451f..35b7fc87eac5 100644 > --- a/drivers/pci/bus.c > +++ b/drivers/pci/bus.c > @@ -120,7 +120,7 @@ int devm_request_pci_bus_resources(struct device *dev, > EXPORT_SYMBOL_GPL(devm_request_pci_bus_resources); > > static struct pci_bus_region pci_32_bit = {0, 0xffffffffULL}; > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > static struct pci_bus_region pci_64_bit = {0, > (pci_bus_addr_t) 0xffffffffffffffffULL}; > static struct pci_bus_region pci_high = {(pci_bus_addr_t) 0x100000000ULL, > @@ -230,7 +230,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, > resource_size_t), > void *alignf_data) > { > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > int rc; > > if (res->flags & IORESOURCE_MEM_64) { > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 73178a2fcee0..55371cb827ad 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -670,7 +670,7 @@ int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn, > int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn, > int reg, int len, u32 val); > > -#ifdef CONFIG_PCI_BUS_ADDR_T_64BIT > +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > typedef u64 pci_bus_addr_t; > #else > typedef u32 pci_bus_addr_t; > -- > 2.17.0 >