From: Simon Horman <horms@kernel•org>
To: Raju Rangoju <Raju.Rangoju@amd•com>
Cc: netdev@vger•kernel.org, davem@davemloft•net, edumazet@google•com,
kuba@kernel•org, pabeni@redhat•com, Shyam-sundar.S-k@amd•com
Subject: Re: [PATCH v2 net-next 1/4] amd-xgbe: reorganize the code of XPCS access
Date: Sun, 19 Nov 2023 16:37:44 +0000 [thread overview]
Message-ID: <20231119163744.GC186930@vergenet.net> (raw)
In-Reply-To: <20231116135416.3371367-2-Raju.Rangoju@amd.com>
On Thu, Nov 16, 2023 at 07:24:13PM +0530, Raju Rangoju wrote:
> The xgbe_{read/write}_mmd_regs_v* functions have common code which can
> be moved to helper functions. Also, the xgbe_pci_probe() needs
> reorganization.
>
> Add new helper functions to calculate the mmd_address for v1/v2 of xpcs
> access. And, convert if/else statements in xgbe_pci_probe() to switch
> case. This helps code look cleaner.
>
> Signed-off-by: Raju Rangoju <Raju.Rangoju@amd•com>
...
> diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
> index f409d7bd1f1e..d6071f34b7db 100644
> --- a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
> +++ b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c
> @@ -274,12 +274,16 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>
> /* Set the PCS indirect addressing definition registers */
> rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
> - if (rdev &&
> - (rdev->vendor == PCI_VENDOR_ID_AMD) && (rdev->device == 0x15d0)) {
> +
> + if (!(rdev && rdev->vendor == PCI_VENDOR_ID_AMD))
> + goto err_pci_enable;
Hi Raju,
Jumping to err_pci_enable will result in the function returning ret.
However, it appears that ret is set to 0 here. Perhaps it should
be set to an negative error code instead?
Flagged by Smatch.
> +
> + switch (rdev->device) {
> + case 0x15d0:
> pdata->xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;
> pdata->xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;
> - } else if (rdev && (rdev->vendor == PCI_VENDOR_ID_AMD) &&
> - (rdev->device == 0x14b5)) {
> + break;
> + case 0x14b5:
> pdata->xpcs_window_def_reg = PCS_V2_YC_WINDOW_DEF;
> pdata->xpcs_window_sel_reg = PCS_V2_YC_WINDOW_SELECT;
>
> @@ -288,9 +292,11 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>
> /* Yellow Carp devices do not need rrc */
> pdata->vdata->enable_rrc = 0;
> - } else {
> + break;
> + default:
> pdata->xpcs_window_def_reg = PCS_V2_WINDOW_DEF;
> pdata->xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;
> + break;
> }
> pci_dev_put(rdev);
>
> --
> 2.34.1
>
next prev parent reply other threads:[~2023-11-19 16:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-16 13:54 [PATCH v2 net-next 0/4] amd-xgbe: add support for AMD Crater Raju Rangoju
2023-11-16 13:54 ` [PATCH v2 net-next 1/4] amd-xgbe: reorganize the code of XPCS access Raju Rangoju
2023-11-19 16:37 ` Simon Horman [this message]
2023-11-16 13:54 ` [PATCH v2 net-next 2/4] amd-xgbe: add support for Crater ethernet device Raju Rangoju
2023-11-19 16:42 ` Simon Horman
2023-11-16 13:54 ` [PATCH v2 net-next 3/4] amd-xgbe: add support for new pci device id 0x1641 Raju Rangoju
2023-11-16 13:54 ` [PATCH v2 net-next 4/4] amd-xgbe: use smn functions to avoid race Raju Rangoju
2023-11-16 20:49 ` kernel test robot
2023-11-22 16:26 ` kernel test robot
Reply instructions:
You may reply publicly 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=20231119163744.GC186930@vergenet.net \
--to=horms@kernel$(echo .)org \
--cc=Raju.Rangoju@amd$(echo .)com \
--cc=Shyam-sundar.S-k@amd$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox