From: Jean Delvare <jdelvare@suse.de>
To: Terry Bowman <terry.bowman@amd.com>
Cc: <linux@roeck-us.net>, <linux-watchdog@vger.kernel.org>,
<linux-i2c@vger.kernel.org>, <wsa@kernel.org>,
<andy.shevchenko@gmail.com>, <rafael.j.wysocki@intel.com>,
<linux-kernel@vger.kernel.org>, <wim@linux-watchdog.org>,
<rrichter@amd.com>, <thomas.lendacky@amd.com>,
<sudheesh.mavila@amd.com>, <Nehal-bakulchandra.Shah@amd.com>,
<Basavaraj.Natikar@amd.com>, <Shyam-sundar.S-k@amd.com>,
<Mario.Limonciello@amd.com>
Subject: Re: [PATCH v5 3/9] i2c: piix4: Move port I/O region request/release code into functions
Date: Fri, 11 Feb 2022 10:53:22 +0100 [thread overview]
Message-ID: <20220211105322.180ad89d@endymion.delvare> (raw)
In-Reply-To: <20220209172717.178813-4-terry.bowman@amd.com>
On Wed, 09 Feb 2022 11:27:11 -0600, Terry Bowman wrote:
> Move duplicated region request and release code into a function. Move is
> in preparation for following MMIO changes.
>
> Signed-off-by: Terry Bowman <terry.bowman@amd.com>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Reviewed-by: Jean Delvare <jdelvare@suse.de>
> ---
> drivers/i2c/busses/i2c-piix4.c | 48 ++++++++++++++++++++++------------
> 1 file changed, 31 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
> index 3ff68967034e..cc488b1e92c3 100644
> --- a/drivers/i2c/busses/i2c-piix4.c
> +++ b/drivers/i2c/busses/i2c-piix4.c
> @@ -165,6 +165,24 @@ struct i2c_piix4_adapdata {
> u8 port; /* Port number, shifted */
> };
>
> +static int piix4_sb800_region_request(struct device *dev)
> +{
> + if (!request_muxed_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE,
> + "sb800_piix4_smb")) {
> + dev_err(dev,
> + "SMBus base address index region 0x%x already in use.\n",
> + SB800_PIIX4_SMB_IDX);
> + return -EBUSY;
> + }
> +
> + return 0;
> +}
> +
> +static void piix4_sb800_region_release(struct device *dev)
> +{
> + release_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE);
> +}
> +
> static int piix4_setup(struct pci_dev *PIIX4_dev,
> const struct pci_device_id *id)
> {
> @@ -270,6 +288,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
> unsigned short piix4_smba;
> u8 smba_en_lo, smba_en_hi, smb_en, smb_en_status, port_sel;
> u8 i2ccfg, i2ccfg_offset = 0x10;
> + int retval;
>
> /* SB800 and later SMBus does not support forcing address */
> if (force || force_addr) {
> @@ -291,20 +310,16 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
> else
> smb_en = (aux) ? 0x28 : 0x2c;
>
> - if (!request_muxed_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE,
> - "sb800_piix4_smb")) {
> - dev_err(&PIIX4_dev->dev,
> - "SMB base address index region 0x%x already in use.\n",
> - SB800_PIIX4_SMB_IDX);
> - return -EBUSY;
> - }
> + retval = piix4_sb800_region_request(&PIIX4_dev->dev);
> + if (retval)
> + return retval;
>
> outb_p(smb_en, SB800_PIIX4_SMB_IDX);
> smba_en_lo = inb_p(SB800_PIIX4_SMB_IDX + 1);
> outb_p(smb_en + 1, SB800_PIIX4_SMB_IDX);
> smba_en_hi = inb_p(SB800_PIIX4_SMB_IDX + 1);
>
> - release_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE);
> + piix4_sb800_region_release(&PIIX4_dev->dev);
>
> if (!smb_en) {
> smb_en_status = smba_en_lo & 0x10;
> @@ -373,11 +388,10 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
> piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT;
> }
> } else {
> - if (!request_muxed_region(SB800_PIIX4_SMB_IDX,
> - SB800_PIIX4_SMB_MAP_SIZE,
> - "sb800_piix4_smb")) {
> + retval = piix4_sb800_region_request(&PIIX4_dev->dev);
> + if (retval)
Missing curly brace here, breaks the build.
> release_region(piix4_smba, SMBIOSIZE);
> - return -EBUSY;
> + return retval;
> }
>
> outb_p(SB800_PIIX4_PORT_IDX_SEL, SB800_PIIX4_SMB_IDX);
> @@ -387,7 +401,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
> SB800_PIIX4_PORT_IDX;
> piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK;
> piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT;
> - release_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE);
> + piix4_sb800_region_release(&PIIX4_dev->dev);
> }
>
> dev_info(&PIIX4_dev->dev,
> @@ -685,9 +699,9 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr,
> u8 port;
> int retval;
>
> - if (!request_muxed_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE,
> - "sb800_piix4_smb"))
> - return -EBUSY;
> + retval = piix4_sb800_region_request(&adap->dev);
> + if (retval)
> + return retval;
>
> /* Request the SMBUS semaphore, avoid conflicts with the IMC */
> smbslvcnt = inb_p(SMBSLVCNT);
> @@ -762,7 +776,7 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr,
> piix4_imc_wakeup();
>
> release:
> - release_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE);
> + piix4_sb800_region_release(&adap->dev);
> return retval;
> }
>
--
Jean Delvare
SUSE L3 Support
next prev parent reply other threads:[~2022-02-11 9:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-09 17:27 [PATCH v5 0/9] i2c: piix4: Replace cd6h/cd7h port I/O accesses with MMIO accesses Terry Bowman
2022-02-09 17:27 ` [PATCH v5 1/9] kernel/resource: Introduce request_mem_region_muxed() Terry Bowman
2022-02-09 17:27 ` [PATCH v5 2/9] i2c: piix4: Replace hardcoded memory map size with a #define Terry Bowman
2022-02-09 17:27 ` [PATCH v5 3/9] i2c: piix4: Move port I/O region request/release code into functions Terry Bowman
2022-02-11 9:53 ` Jean Delvare [this message]
2022-02-11 14:42 ` Wolfram Sang
2022-02-11 15:00 ` Terry Bowman
2022-02-11 18:25 ` Terry Bowman
2022-02-15 8:37 ` Jean Delvare
2022-02-15 9:00 ` Wolfram Sang
2022-02-09 17:27 ` [PATCH v5 4/9] i2c: piix4: Move SMBus controller base address detect into function Terry Bowman
2022-02-09 17:27 ` [PATCH v5 5/9] i2c: piix4: Move SMBus port selection " Terry Bowman
2022-02-09 17:27 ` [PATCH v5 6/9] i2c: piix4: Add EFCH MMIO support to region request and release Terry Bowman
2022-02-09 17:27 ` [PATCH v5 7/9] i2c: piix4: Add EFCH MMIO support to SMBus base address detect Terry Bowman
2022-02-09 17:27 ` [PATCH v5 8/9] i2c: piix4: Add EFCH MMIO support for SMBus port select Terry Bowman
2022-02-09 17:27 ` [PATCH v5 9/9] i2c: piix4: Enable EFCH MMIO for Family 17h+ Terry Bowman
2022-02-10 21:49 ` [PATCH v5 0/9] i2c: piix4: Replace cd6h/cd7h port I/O accesses with MMIO accesses Wolfram Sang
2022-02-11 12:34 ` Jean Delvare
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=20220211105322.180ad89d@endymion.delvare \
--to=jdelvare@suse.de \
--cc=Basavaraj.Natikar@amd.com \
--cc=Mario.Limonciello@amd.com \
--cc=Nehal-bakulchandra.Shah@amd.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=andy.shevchenko@gmail.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=rafael.j.wysocki@intel.com \
--cc=rrichter@amd.com \
--cc=sudheesh.mavila@amd.com \
--cc=terry.bowman@amd.com \
--cc=thomas.lendacky@amd.com \
--cc=wim@linux-watchdog.org \
--cc=wsa@kernel.org \
/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
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