Message-ID: <18a73c95-53da-9acb-9e10-0e6095e7dd31@intel.com>
Date:   Tue, 7 Mar 2023 14:50:08 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.6.0
Subject: Re: [PATCH] dmaengine: ioat: use PCI core macros for PCIe Capability
Content-Language: en-US
To:     Bjorn Helgaas <helgaas@kernel.org>, Vinod Koul <vkoul@kernel.org>
Cc:     dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
        Bjorn Helgaas <bhelgaas@google.com>
References: <20230307214615.887354-1-helgaas@kernel.org>
From:   Dave Jiang <dave.jiang@intel.com>
In-Reply-To: <20230307214615.887354-1-helgaas@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 3/7/23 2:46 PM, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
> 
> The PCIe Capability is defined by the PCIe spec, so use the PCI_EXP_DEVCTL
> macros defined by the PCI core instead of defining copies in IOAT.  This
> makes it easier to find all uses of the PCIe Device Control register.  No
> functional change intended.
> 
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Acked-by: Dave Jiang <dave.jiang@intel.com>

> ---
>   drivers/dma/ioat/init.c      | 6 +++---
>   drivers/dma/ioat/registers.h | 7 -------
>   2 files changed, 3 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c
> index 5d707ff63554..fa7c0f9aa61d 100644
> --- a/drivers/dma/ioat/init.c
> +++ b/drivers/dma/ioat/init.c
> @@ -1191,13 +1191,13 @@ static int ioat3_dma_probe(struct ioatdma_device *ioat_dma, int dca)
>   		ioat_dma->dca = ioat_dca_init(pdev, ioat_dma->reg_base);
>   
>   	/* disable relaxed ordering */
> -	err = pcie_capability_read_word(pdev, IOAT_DEVCTRL_OFFSET, &val16);
> +	err = pcie_capability_read_word(pdev, PCI_EXP_DEVCTL, &val16);
>   	if (err)
>   		return pcibios_err_to_errno(err);
>   
>   	/* clear relaxed ordering enable */
> -	val16 &= ~IOAT_DEVCTRL_ROE;
> -	err = pcie_capability_write_word(pdev, IOAT_DEVCTRL_OFFSET, val16);
> +	val16 &= ~PCI_EXP_DEVCTL_RELAX_EN;
> +	err = pcie_capability_write_word(pdev, PCI_EXP_DEVCTL, val16);
>   	if (err)
>   		return pcibios_err_to_errno(err);
>   
> diff --git a/drivers/dma/ioat/registers.h b/drivers/dma/ioat/registers.h
> index f55a5f92f185..54cf0ad39887 100644
> --- a/drivers/dma/ioat/registers.h
> +++ b/drivers/dma/ioat/registers.h
> @@ -14,13 +14,6 @@
>   #define IOAT_PCI_CHANERR_INT_OFFSET		0x180
>   #define IOAT_PCI_CHANERRMASK_INT_OFFSET		0x184
>   
> -/* PCIe config registers */
> -
> -/* EXPCAPID + N */
> -#define IOAT_DEVCTRL_OFFSET			0x8
> -/* relaxed ordering enable */
> -#define IOAT_DEVCTRL_ROE			0x10
> -
>   /* MMIO Device Registers */
>   #define IOAT_CHANCNT_OFFSET			0x00	/*  8-bit */
>