Linux-ide Archive on lore.kernel.org
 help / color / Atom feed
From: "Vaden, Tom (HPE Server OS Architecture)" <tom.vaden@hpe.com>
To: Christoph Hellwig <hch@lst.de>, Tony Luck <tony.luck@intel.com>,
	"Fenghua Yu" <fenghua.yu@intel.com>,
	"Travis, Mike" <mike.travis@hpe.com>,
	"Sivanich, Dimitri" <dimitri.sivanich@hpe.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"linux-ia64@vger.kernel.org" <linux-ia64@vger.kernel.org>,
	"linux-ide@vger.kernel.org" <linux-ide@vger.kernel.org>,
	"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 18/28] ia64: remove CONFIG_PCI ifdefs
Date: Tue, 13 Aug 2019 21:07:12 +0000
Message-ID: <69070d1b-9353-0ae7-e16f-d3feb84bd2a6@hpe.com> (raw)
In-Reply-To: <20190813072514.23299-19-hch@lst.de>



On 8/13/19 3:25 AM, Christoph Hellwig wrote:
> Now that hpsim support is gone, CONFIG_PCI is forced on for ia64, and
> we can remove a few ifdefs for it.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Okay to remove hpsim support
Acked-by: Tom Vaden <tom.vaden@hpe.com>

> ---
>   arch/ia64/Makefile              |  2 +-
>   arch/ia64/hp/common/sba_iommu.c | 10 +---------
>   arch/ia64/include/asm/dma.h     |  6 +-----
>   arch/ia64/kernel/sys_ia64.c     | 18 ------------------
>   arch/ia64/mm/init.c             |  2 --
>   5 files changed, 3 insertions(+), 35 deletions(-)
> 
> diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
> index 8b866fc1f9cb..c06802799659 100644
> --- a/arch/ia64/Makefile
> +++ b/arch/ia64/Makefile
> @@ -57,7 +57,7 @@ core-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/dig/
>   core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/
>   core-$(CONFIG_IA64_SGI_UV)	+= arch/ia64/uv/
>   
> -drivers-$(CONFIG_PCI)		+= arch/ia64/pci/
> +drivers-y			+= arch/ia64/pci/
>   drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/
>   drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/
>   drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/uv/
> diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
> index 3d24cc43385b..18321ce8bfa0 100644
> --- a/arch/ia64/hp/common/sba_iommu.c
> +++ b/arch/ia64/hp/common/sba_iommu.c
> @@ -251,12 +251,8 @@ static SBA_INLINE void sba_free_range(struct ioc *, dma_addr_t, size_t);
>   static u64 prefetch_spill_page;
>   #endif
>   
> -#ifdef CONFIG_PCI
> -# define GET_IOC(dev)	((dev_is_pci(dev))						\
> +#define GET_IOC(dev)	((dev_is_pci(dev))						\
>   			 ? ((struct ioc *) PCI_CONTROLLER(to_pci_dev(dev))->iommu) : NULL)
> -#else
> -# define GET_IOC(dev)	NULL
> -#endif
>   
>   /*
>   ** DMA_CHUNK_SIZE is used by the SCSI mid-layer to break up
> @@ -1741,9 +1737,7 @@ ioc_sac_init(struct ioc *ioc)
>   	controller->iommu = ioc;
>   	sac->sysdata = controller;
>   	sac->dma_mask = 0xFFFFFFFFUL;
> -#ifdef CONFIG_PCI
>   	sac->dev.bus = &pci_bus_type;
> -#endif
>   	ioc->sac_only_dev = sac;
>   }
>   
> @@ -2121,13 +2115,11 @@ sba_init(void)
>   	}
>   #endif
>   
> -#ifdef CONFIG_PCI
>   	{
>   		struct pci_bus *b = NULL;
>   		while ((b = pci_find_next_bus(b)) != NULL)
>   			sba_connect_bus(b);
>   	}
> -#endif
>   
>   #ifdef CONFIG_PROC_FS
>   	ioc_proc_init();
> diff --git a/arch/ia64/include/asm/dma.h b/arch/ia64/include/asm/dma.h
> index 23604d6a2cb2..59625e9c1f9c 100644
> --- a/arch/ia64/include/asm/dma.h
> +++ b/arch/ia64/include/asm/dma.h
> @@ -12,11 +12,7 @@
>   
>   extern unsigned long MAX_DMA_ADDRESS;
>   
> -#ifdef CONFIG_PCI
> -  extern int isa_dma_bridge_buggy;
> -#else
> -# define isa_dma_bridge_buggy 	(0)
> -#endif
> +extern int isa_dma_bridge_buggy;
>   
>   #define free_dma(x)
>   
> diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
> index 9ebe1d633abc..e14db25146c2 100644
> --- a/arch/ia64/kernel/sys_ia64.c
> +++ b/arch/ia64/kernel/sys_ia64.c
> @@ -166,21 +166,3 @@ ia64_mremap (unsigned long addr, unsigned long old_len, unsigned long new_len, u
>   		force_successful_syscall_return();
>   	return addr;
>   }
> -
> -#ifndef CONFIG_PCI
> -
> -asmlinkage long
> -sys_pciconfig_read (unsigned long bus, unsigned long dfn, unsigned long off, unsigned long len,
> -		    void *buf)
> -{
> -	return -ENOSYS;
> -}
> -
> -asmlinkage long
> -sys_pciconfig_write (unsigned long bus, unsigned long dfn, unsigned long off, unsigned long len,
> -		     void *buf)
> -{
> -	return -ENOSYS;
> -}
> -
> -#endif /* CONFIG_PCI */
> diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
> index aae75fd7b810..9a4a16439900 100644
> --- a/arch/ia64/mm/init.c
> +++ b/arch/ia64/mm/init.c
> @@ -632,14 +632,12 @@ mem_init (void)
>   	BUG_ON(PTRS_PER_PMD * sizeof(pmd_t) != PAGE_SIZE);
>   	BUG_ON(PTRS_PER_PTE * sizeof(pte_t) != PAGE_SIZE);
>   
> -#ifdef CONFIG_PCI
>   	/*
>   	 * This needs to be called _after_ the command line has been parsed but _before_
>   	 * any drivers that may need the PCI DMA interface are initialized or bootmem has
>   	 * been freed.
>   	 */
>   	platform_dma_init();
> -#endif
>   
>   #ifdef CONFIG_FLATMEM
>   	BUG_ON(!mem_map);
> 

  reply index

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-13  7:24 RFC: remove sn2, hpsim and ia64 machvecs v2 Christoph Hellwig
2019-08-13  7:24 ` [PATCH 01/28] char: remove the SGI snsc driver Christoph Hellwig
2019-08-13  7:24 ` [PATCH 02/28] char: remove the SGI tiocx/mbcs driver Christoph Hellwig
2019-08-13  7:24 ` [PATCH 03/28] char/agp: remove the sgi-agp driver Christoph Hellwig
2019-08-13  7:24 ` [PATCH 04/28] ide: remove the sgiioc4 driver Christoph Hellwig
2019-08-13  7:24 ` [PATCH 05/28] PCI/hotplug: remove the sgi_hotplug driver Christoph Hellwig
2019-08-13  7:24 ` [PATCH 06/28] tty/serial: remove the sn_console driver Christoph Hellwig
2019-08-13  7:24 ` [PATCH 07/28] tty/serial: remove the ioc4_serial driver Christoph Hellwig
2019-08-13  7:24 ` [PATCH 08/28] tty/serial: remove the ioc3_serial driver Christoph Hellwig
2019-08-13  7:24 ` [PATCH 09/28] char/mspec: remove SGI SN2 support Christoph Hellwig
2019-08-13  7:24 ` [PATCH 10/28] misc/sgi-xp: " Christoph Hellwig
2019-08-13  7:24 ` [PATCH 11/28] qla1280: " Christoph Hellwig
2019-08-13  7:24 ` [PATCH 12/28] qla2xxx: " Christoph Hellwig
2019-08-13  7:24 ` [PATCH 13/28] drivers: remove the SGI SN2 IOC3 base support Christoph Hellwig
2019-08-13  7:25 ` [PATCH 14/28] drivers: remove the SGI SN2 IOC4 " Christoph Hellwig
2019-08-13  7:25 ` [PATCH 16/28] ia64: remove now unused machvec indirections Christoph Hellwig
2019-08-13  7:25 ` [PATCH 17/28] ia64: remove the hpsim platform Christoph Hellwig
2019-08-13 21:06   ` Vaden, Tom (HPE Server OS Architecture)
2019-08-13  7:25 ` [PATCH 18/28] ia64: remove CONFIG_PCI ifdefs Christoph Hellwig
2019-08-13 21:07   ` Vaden, Tom (HPE Server OS Architecture) [this message]
2019-08-13  7:25 ` [PATCH 19/28] ia64: remove CONFIG_ACPI ifdefs Christoph Hellwig
2019-08-13 21:07   ` Vaden, Tom (HPE Server OS Architecture)
2019-08-13  7:25 ` [PATCH 20/28] ia64: remove the zx1 swiotlb machvec Christoph Hellwig
2019-08-13  7:25 ` [PATCH 21/28] ia64: remove the SGI UV simulator support Christoph Hellwig
2019-08-13  7:25 ` [PATCH 22/28] ia64: remove the unused sn_coherency_id symbol Christoph Hellwig
2019-08-13  7:25 ` [PATCH 23/28] ia64: rework iommu probing Christoph Hellwig
2019-08-13  7:25 ` [PATCH 24/28] ia64: move the ROOT_DEV setup to common code Christoph Hellwig
2019-08-13  7:25 ` [PATCH 25/28] ia64: move the screen_info " Christoph Hellwig
2019-08-13  7:25 ` [PATCH 26/28] ia64: remove support for machvecs Christoph Hellwig
2019-08-13  7:25 ` [PATCH 27/28] ia64: remove CONFIG_SWIOTLB ifdefs Christoph Hellwig
2019-08-13  7:25 ` [PATCH 28/28] genirq: remove the is_affinity_mask_valid hook Christoph Hellwig

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=69070d1b-9353-0ae7-e16f-d3feb84bd2a6@hpe.com \
    --to=tom.vaden@hpe.com \
    --cc=arnd@arndb.de \
    --cc=dimitri.sivanich@hpe.com \
    --cc=fenghua.yu@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hch@lst.de \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=mike.travis@hpe.com \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-ide Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-ide/0 linux-ide/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-ide linux-ide/ https://lore.kernel.org/linux-ide \
		linux-ide@vger.kernel.org linux-ide@archiver.kernel.org
	public-inbox-index linux-ide


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-ide


AGPL code for this site: git clone https://public-inbox.org/ public-inbox